diff --git a/settings.gradle b/settings.gradle
index a0680db5208a87f3b52d2094a61a51e547007a0f..61485fa3197eda7a25af735ea06f8fc6767d0e2d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,34 +1,22 @@
 rootProject.name = 'spring'
 
-include 'org.springframework.core'
-include 'org.springframework.asm'
-include 'org.springframework.beans'
-include 'org.springframework.aop'
-include 'org.springframework.expression'
-include 'org.springframework.instrument'
-include 'org.springframework.instrument.tomcat'
-include 'org.springframework.context'
-include 'org.springframework.transaction'
-include 'org.springframework.oxm'
-include 'org.springframework.jms'
-include 'org.springframework.jdbc'
-include 'org.springframework.context.support'
-include 'org.springframework.web'
-include 'org.springframework.orm'
-include 'org.springframework.web.servlet'
-include 'org.springframework.test'
-include 'org.springframework.web.portlet'
-include 'org.springframework.web.struts'
-include 'org.springframework.aspects'
-
-// transform project names to maven-central artifact naming
-// e.g.: org.springframework.context.support => spring-context-support
-rootProject.children.each { project ->
-    project.name = project.name.replace('org.springframework', 'spring').replace('.', '-')
-}
-
-// special cases
-project(":spring-transaction").name = 'spring-tx'
-project(":spring-web-servlet").name = 'spring-webmvc'
-project(":spring-web-portlet").name = 'spring-webmvc-portlet'
-project(":spring-web-struts").name = 'spring-struts'
+include 'spring-aop'
+include 'spring-asm'
+include 'spring-aspects'
+include 'spring-beans'
+include 'spring-context'
+include 'spring-context-support'
+include 'spring-core'
+include 'spring-expression'
+include 'spring-instrument'
+include 'spring-instrument-tomcat'
+include 'spring-jdbc'
+include 'spring-jms'
+include 'spring-orm'
+include 'spring-oxm'
+include 'spring-struts'
+include 'spring-test'
+include 'spring-tx'
+include 'spring-web'
+include 'spring-webmvc'
+include 'spring-webmvc-portlet'
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/Advisor.java b/spring-aop/src/main/java/org/springframework/aop/Advisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/Advisor.java
rename to spring-aop/src/main/java/org/springframework/aop/Advisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/AfterAdvice.java b/spring-aop/src/main/java/org/springframework/aop/AfterAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/AfterAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/AfterAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java b/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/AopInvocationException.java b/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/AopInvocationException.java
rename to spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/BeforeAdvice.java b/spring-aop/src/main/java/org/springframework/aop/BeforeAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/BeforeAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/BeforeAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/ClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/ClassFilter.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/ClassFilter.java
rename to spring-aop/src/main/java/org/springframework/aop/ClassFilter.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java b/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java
rename to spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/IntroductionInfo.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/IntroductionInfo.java
rename to spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/IntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/IntroductionInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/IntroductionInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java b/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/MethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/MethodMatcher.java
rename to spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/Pointcut.java b/spring-aop/src/main/java/org/springframework/aop/Pointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/Pointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/Pointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/PointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/PointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java
rename to spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/RawTargetAccess.java b/spring-aop/src/main/java/org/springframework/aop/RawTargetAccess.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/RawTargetAccess.java
rename to spring-aop/src/main/java/org/springframework/aop/RawTargetAccess.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/SpringProxy.java b/spring-aop/src/main/java/org/springframework/aop/SpringProxy.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/SpringProxy.java
rename to spring-aop/src/main/java/org/springframework/aop/SpringProxy.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/TargetClassAware.java b/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/TargetClassAware.java
rename to spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/TargetSource.java b/spring-aop/src/main/java/org/springframework/aop/TargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/TargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/TargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/ThrowsAdvice.java b/spring-aop/src/main/java/org/springframework/aop/ThrowsAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/ThrowsAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/ThrowsAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/TrueClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/TrueClassFilter.java
rename to spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
rename to spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/TruePointcut.java b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/TruePointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJPrecedenceInformation.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPrecedenceInformation.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJPrecedenceInformation.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPrecedenceInformation.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/InstantiationModelAwarePointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/InstantiationModelAwarePointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/InstantiationModelAwarePointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/InstantiationModelAwarePointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectJAdvisorsBuilder.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectJAdvisorsBuilder.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectJAdvisorsBuilder.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectJAdvisorsBuilder.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/LazySingletonAspectInstanceFactoryDecorator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/LazySingletonAspectInstanceFactoryDecorator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/LazySingletonAspectInstanceFactoryDecorator.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/LazySingletonAspectInstanceFactoryDecorator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/PrototypeAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/PrototypeAspectInstanceFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/PrototypeAspectInstanceFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/PrototypeAspectInstanceFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/autoproxy/package-info.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/autoproxy/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/package-info.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/aspectj/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
rename to spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/AdviceEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/AdviceEntry.java
rename to spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
rename to spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java
rename to spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java b/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
rename to spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
rename to spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java
rename to spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/AspectComponentDefinition.java b/spring-aop/src/main/java/org/springframework/aop/config/AspectComponentDefinition.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/AspectComponentDefinition.java
rename to spring-aop/src/main/java/org/springframework/aop/config/AspectComponentDefinition.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/AspectEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/AspectEntry.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/AspectEntry.java
rename to spring-aop/src/main/java/org/springframework/aop/config/AspectEntry.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
rename to spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
rename to spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java
rename to spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java b/spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java
rename to spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/PointcutEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/PointcutEntry.java
rename to spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
rename to spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java
rename to spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/package-info.java b/spring-aop/src/main/java/org/springframework/aop/config/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/config/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/Advised.java b/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/Advised.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/Advised.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AdvisedSupportListener.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupportListener.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/AdvisedSupportListener.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupportListener.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AdvisorChainFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisorChainFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/AdvisorChainFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/AdvisorChainFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AopConfigException.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/AopConfigException.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AopContext.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/AopContext.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AopInfrastructureBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopInfrastructureBean.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/AopInfrastructureBean.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/AopInfrastructureBean.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/AopProxy.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/Cglib2AopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/Cglib2AopProxy.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/Cglib2AopProxy.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/Cglib2AopProxy.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/InterceptorAndDynamicMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/framework/InterceptorAndDynamicMethodMatcher.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/InterceptorAndDynamicMethodMatcher.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/InterceptorAndDynamicMethodMatcher.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/GlobalAdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/GlobalAdvisorAdapterRegistry.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/GlobalAdvisorAdapterRegistry.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/GlobalAdvisorAdapterRegistry.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/target/package.html b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/package.html
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/target/package.html
rename to spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/package.html
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/package-info.java b/spring-aop/src/main/java/org/springframework/aop/framework/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/framework/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/framework/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/package-info.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/interceptor/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/interceptor/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/package-info.java b/spring-aop/src/main/java/org/springframework/aop/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
rename to spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/scope/ScopedObject.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/scope/ScopedObject.java
rename to spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
rename to spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java
rename to spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/scope/package-info.java b/spring-aop/src/main/java/org/springframework/aop/scope/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/scope/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/scope/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/AopUtils.java b/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/AopUtils.java
rename to spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/ClassFilters.java b/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/ClassFilters.java
rename to spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
rename to spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
rename to spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/ExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ExpressionPointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/ExpressionPointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/support/ExpressionPointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java b/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java
rename to spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/MethodMatchers.java b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
rename to spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/Pointcuts.java b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/Pointcuts.java
rename to spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/RootClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
rename to spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
rename to spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java
rename to spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
rename to spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
rename to spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
rename to spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/annotation/package-info.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/annotation/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/support/annotation/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/support/package-info.java b/spring-aop/src/main/java/org/springframework/aop/support/package-info.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/support/package-info.java
rename to spring-aop/src/main/java/org/springframework/aop/support/package-info.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/PoolingConfig.java b/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/PoolingConfig.java
rename to spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java
rename to spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java
rename to spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java
rename to spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/dynamic/package.html b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/package.html
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/dynamic/package.html
rename to spring-aop/src/main/java/org/springframework/aop/target/dynamic/package.html
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/package.html b/spring-aop/src/main/java/org/springframework/aop/target/package.html
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/target/package.html
rename to spring-aop/src/main/java/org/springframework/aop/target/package.html
diff --git a/org.springframework.aop/src/main/java/overview.html b/spring-aop/src/main/java/overview.html
similarity index 100%
rename from org.springframework.aop/src/main/java/overview.html
rename to spring-aop/src/main/java/overview.html
diff --git a/org.springframework.aop/src/main/resources/META-INF/spring.handlers b/spring-aop/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from org.springframework.aop/src/main/resources/META-INF/spring.handlers
rename to spring-aop/src/main/resources/META-INF/spring.handlers
diff --git a/org.springframework.aop/src/main/resources/META-INF/spring.schemas b/spring-aop/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from org.springframework.aop/src/main/resources/META-INF/spring.schemas
rename to spring-aop/src/main/resources/META-INF/spring.schemas
diff --git a/org.springframework.aop/src/main/resources/META-INF/spring.tooling b/spring-aop/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from org.springframework.aop/src/main/resources/META-INF/spring.tooling
rename to spring-aop/src/main/resources/META-INF/spring.tooling
diff --git a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd
similarity index 100%
rename from org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd
rename to spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd
diff --git a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd
similarity index 100%
rename from org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd
rename to spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd
diff --git a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd
similarity index 100%
rename from org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd
rename to spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd
diff --git a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-3.1.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.1.xsd
similarity index 100%
rename from org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-3.1.xsd
rename to spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.1.xsd
diff --git a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop.gif b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop.gif
similarity index 100%
rename from org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop.gif
rename to spring-aop/src/main/resources/org/springframework/aop/config/spring-aop.gif
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
rename to spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
rename to spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
rename to spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml
rename to spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
rename to spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
rename to spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
rename to spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
rename to spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
rename to spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests-context.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests-context.xml
rename to spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests-context.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
rename to spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
rename to spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
rename to spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
rename to spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests-context.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests-context.xml
rename to spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests-context.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
rename to spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
rename to spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
rename to spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
rename to spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
rename to spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
rename to spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
rename to spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
rename to spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
rename to spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java
rename to spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java
rename to spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java
rename to spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml
rename to spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml
rename to spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
rename to spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/PointcutsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
rename to spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
rename to spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml
rename to spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
rename to spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
rename to spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
rename to spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java
rename to spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
rename to spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml
rename to spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
rename to spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
rename to spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
rename to spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
rename to spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
rename to spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
rename to spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
rename to spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
similarity index 100%
rename from org.springframework.aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
rename to spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
diff --git a/org.springframework.aop/src/test/java/test/annotation/EmptySpringAnnotation.java b/spring-aop/src/test/java/test/annotation/EmptySpringAnnotation.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/annotation/EmptySpringAnnotation.java
rename to spring-aop/src/test/java/test/annotation/EmptySpringAnnotation.java
diff --git a/org.springframework.aop/src/test/java/test/annotation/transaction/Tx.java b/spring-aop/src/test/java/test/annotation/transaction/Tx.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/annotation/transaction/Tx.java
rename to spring-aop/src/test/java/test/annotation/transaction/Tx.java
diff --git a/org.springframework.aop/src/test/java/test/aop/CountingBeforeAdvice.java b/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/aop/CountingBeforeAdvice.java
rename to spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java
diff --git a/org.springframework.aop/src/test/java/test/aop/DefaultLockable.java b/spring-aop/src/test/java/test/aop/DefaultLockable.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/aop/DefaultLockable.java
rename to spring-aop/src/test/java/test/aop/DefaultLockable.java
diff --git a/org.springframework.aop/src/test/java/test/aop/Lockable.java b/spring-aop/src/test/java/test/aop/Lockable.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/aop/Lockable.java
rename to spring-aop/src/test/java/test/aop/Lockable.java
diff --git a/org.springframework.aop/src/test/java/test/aop/MethodCounter.java b/spring-aop/src/test/java/test/aop/MethodCounter.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/aop/MethodCounter.java
rename to spring-aop/src/test/java/test/aop/MethodCounter.java
diff --git a/org.springframework.aop/src/test/java/test/aop/NopInterceptor.java b/spring-aop/src/test/java/test/aop/NopInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/aop/NopInterceptor.java
rename to spring-aop/src/test/java/test/aop/NopInterceptor.java
diff --git a/org.springframework.aop/src/test/java/test/aop/PerTargetAspect.java b/spring-aop/src/test/java/test/aop/PerTargetAspect.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/aop/PerTargetAspect.java
rename to spring-aop/src/test/java/test/aop/PerTargetAspect.java
diff --git a/org.springframework.aop/src/test/java/test/aop/PerThisAspect.java b/spring-aop/src/test/java/test/aop/PerThisAspect.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/aop/PerThisAspect.java
rename to spring-aop/src/test/java/test/aop/PerThisAspect.java
diff --git a/org.springframework.aop/src/test/java/test/aop/SerializableNopInterceptor.java b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/aop/SerializableNopInterceptor.java
rename to spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
diff --git a/org.springframework.aop/src/test/java/test/aop/TwoAdviceAspect.java b/spring-aop/src/test/java/test/aop/TwoAdviceAspect.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/aop/TwoAdviceAspect.java
rename to spring-aop/src/test/java/test/aop/TwoAdviceAspect.java
diff --git a/org.springframework.aop/src/test/java/test/beans/Colour.java b/spring-aop/src/test/java/test/beans/Colour.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/Colour.java
rename to spring-aop/src/test/java/test/beans/Colour.java
diff --git a/org.springframework.aop/src/test/java/test/beans/CountingTestBean.java b/spring-aop/src/test/java/test/beans/CountingTestBean.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/CountingTestBean.java
rename to spring-aop/src/test/java/test/beans/CountingTestBean.java
diff --git a/org.springframework.aop/src/test/java/test/beans/DerivedTestBean.java b/spring-aop/src/test/java/test/beans/DerivedTestBean.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/DerivedTestBean.java
rename to spring-aop/src/test/java/test/beans/DerivedTestBean.java
diff --git a/org.springframework.aop/src/test/java/test/beans/INestedTestBean.java b/spring-aop/src/test/java/test/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/INestedTestBean.java
rename to spring-aop/src/test/java/test/beans/INestedTestBean.java
diff --git a/org.springframework.aop/src/test/java/test/beans/IOther.java b/spring-aop/src/test/java/test/beans/IOther.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/IOther.java
rename to spring-aop/src/test/java/test/beans/IOther.java
diff --git a/org.springframework.aop/src/test/java/test/beans/ITestBean.java b/spring-aop/src/test/java/test/beans/ITestBean.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/ITestBean.java
rename to spring-aop/src/test/java/test/beans/ITestBean.java
diff --git a/org.springframework.aop/src/test/java/test/beans/NestedTestBean.java b/spring-aop/src/test/java/test/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/NestedTestBean.java
rename to spring-aop/src/test/java/test/beans/NestedTestBean.java
diff --git a/org.springframework.aop/src/test/java/test/beans/Person.java b/spring-aop/src/test/java/test/beans/Person.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/Person.java
rename to spring-aop/src/test/java/test/beans/Person.java
diff --git a/org.springframework.aop/src/test/java/test/beans/SerializablePerson.java b/spring-aop/src/test/java/test/beans/SerializablePerson.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/SerializablePerson.java
rename to spring-aop/src/test/java/test/beans/SerializablePerson.java
diff --git a/org.springframework.aop/src/test/java/test/beans/SideEffectBean.java b/spring-aop/src/test/java/test/beans/SideEffectBean.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/SideEffectBean.java
rename to spring-aop/src/test/java/test/beans/SideEffectBean.java
diff --git a/org.springframework.aop/src/test/java/test/beans/TestBean.java b/spring-aop/src/test/java/test/beans/TestBean.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/TestBean.java
rename to spring-aop/src/test/java/test/beans/TestBean.java
diff --git a/org.springframework.aop/src/test/java/test/beans/subpkg/DeepBean.java b/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/beans/subpkg/DeepBean.java
rename to spring-aop/src/test/java/test/beans/subpkg/DeepBean.java
diff --git a/org.springframework.aop/src/test/java/test/parsing/CollectingReaderEventListener.java b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/parsing/CollectingReaderEventListener.java
rename to spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java
diff --git a/org.springframework.aop/src/test/java/test/util/SerializationTestUtils.java b/spring-aop/src/test/java/test/util/SerializationTestUtils.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/util/SerializationTestUtils.java
rename to spring-aop/src/test/java/test/util/SerializationTestUtils.java
diff --git a/org.springframework.aop/src/test/java/test/util/TestResourceUtils.java b/spring-aop/src/test/java/test/util/TestResourceUtils.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/util/TestResourceUtils.java
rename to spring-aop/src/test/java/test/util/TestResourceUtils.java
diff --git a/org.springframework.aop/src/test/java/test/util/TimeStamped.java b/spring-aop/src/test/java/test/util/TimeStamped.java
similarity index 100%
rename from org.springframework.aop/src/test/java/test/util/TimeStamped.java
rename to spring-aop/src/test/java/test/util/TimeStamped.java
diff --git a/org.springframework.aop/src/test/resources/log4j.xml b/spring-aop/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.aop/src/test/resources/log4j.xml
rename to spring-aop/src/test/resources/log4j.xml
diff --git a/org.springframework.aop/template.mf b/spring-aop/template.mf
similarity index 100%
rename from org.springframework.aop/template.mf
rename to spring-aop/template.mf
diff --git a/org.springframework.asm/src/main/java/.gitignore b/spring-asm/src/main/java/.gitignore
similarity index 100%
rename from org.springframework.asm/src/main/java/.gitignore
rename to spring-asm/src/main/java/.gitignore
diff --git a/org.springframework.asm/src/main/java/org/springframework/asm/SpringAsmInfo.java b/spring-asm/src/main/java/org/springframework/asm/SpringAsmInfo.java
similarity index 100%
rename from org.springframework.asm/src/main/java/org/springframework/asm/SpringAsmInfo.java
rename to spring-asm/src/main/java/org/springframework/asm/SpringAsmInfo.java
diff --git a/org.springframework.asm/src/main/java/org/springframework/asm/package-info.java b/spring-asm/src/main/java/org/springframework/asm/package-info.java
similarity index 100%
rename from org.springframework.asm/src/main/java/org/springframework/asm/package-info.java
rename to spring-asm/src/main/java/org/springframework/asm/package-info.java
diff --git a/org.springframework.asm/src/main/resources/.gitignore b/spring-asm/src/main/resources/.gitignore
similarity index 100%
rename from org.springframework.asm/src/main/resources/.gitignore
rename to spring-asm/src/main/resources/.gitignore
diff --git a/org.springframework.asm/src/test/java/.gitignore b/spring-asm/src/test/java/.gitignore
similarity index 100%
rename from org.springframework.asm/src/test/java/.gitignore
rename to spring-asm/src/test/java/.gitignore
diff --git a/org.springframework.asm/src/test/resources/.gitignore b/spring-asm/src/test/resources/.gitignore
similarity index 100%
rename from org.springframework.asm/src/test/resources/.gitignore
rename to spring-asm/src/test/resources/.gitignore
diff --git a/org.springframework.asm/template.mf b/spring-asm/template.mf
similarity index 100%
rename from org.springframework.asm/template.mf
rename to spring-asm/template.mf
diff --git a/org.springframework.aspects/aspectJ.gradle b/spring-aspects/aspectJ.gradle
similarity index 100%
rename from org.springframework.aspects/aspectJ.gradle
rename to spring-aspects/aspectJ.gradle
diff --git a/org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
rename to spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj
rename to spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj
rename to spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj
rename to spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
rename to spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
diff --git a/org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/EnableSpringConfigured.java b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/EnableSpringConfigured.java
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/EnableSpringConfigured.java
rename to spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/EnableSpringConfigured.java
diff --git a/org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
rename to spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/SpringConfiguredConfiguration.java b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/SpringConfiguredConfiguration.java
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/beans/factory/aspectj/SpringConfiguredConfiguration.java
rename to spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/SpringConfiguredConfiguration.java
diff --git a/org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj
rename to spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj
rename to spring-aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java
rename to spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java
diff --git a/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
rename to spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
rename to spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java b/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java
rename to spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java
diff --git a/org.springframework.aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
rename to spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj
rename to spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj
rename to spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java
rename to spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java
diff --git a/org.springframework.aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
rename to spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj
rename to spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj
diff --git a/org.springframework.aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java
similarity index 100%
rename from org.springframework.aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java
rename to spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java
diff --git a/org.springframework.aspects/src/main/java/overview.html b/spring-aspects/src/main/java/overview.html
similarity index 100%
rename from org.springframework.aspects/src/main/java/overview.html
rename to spring-aspects/src/main/java/overview.html
diff --git a/org.springframework.aspects/src/main/resources/META-INF/aop.xml b/spring-aspects/src/main/resources/META-INF/aop.xml
similarity index 100%
rename from org.springframework.aspects/src/main/resources/META-INF/aop.xml
rename to spring-aspects/src/main/resources/META-INF/aop.xml
diff --git a/org.springframework.aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java
rename to spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj
rename to spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj
diff --git a/org.springframework.aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml
rename to spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/Colour.java b/spring-aspects/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/Colour.java
rename to spring-aspects/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
rename to spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/IOther.java b/spring-aspects/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/IOther.java
rename to spring-aspects/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/ITestBean.java b/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-aspects/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/TestBean.java b/spring-aspects/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/TestBean.java
rename to spring-aspects/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
rename to spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerTests.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerTests.java
rename to spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerTests.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java
rename to spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java
rename to spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml
rename to spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml
rename to spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml
diff --git a/org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/springConfigured.xml b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/springConfigured.xml
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/beans/factory/aspectj/springConfigured.xml
rename to spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/springConfigured.xml
diff --git a/org.springframework.aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java
rename to spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java
rename to spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
rename to spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/cache/config/CacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/cache/config/CacheableService.java
rename to spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
rename to spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java b/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
rename to spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml b/spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
rename to spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
rename to spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
rename to spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person.java
rename to spring-aspects/src/test/java/org/springframework/mock/staticmock/Person.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
rename to spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
diff --git a/org.springframework.aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java b/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java
rename to spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
rename to spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
rename to spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
rename to spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java
rename to spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java
rename to spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml
rename to spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml
diff --git a/org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
rename to spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
diff --git a/org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java
similarity index 100%
rename from org.springframework.aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java
rename to spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java
diff --git a/org.springframework.aspects/src/test/resources/log4j.xml b/spring-aspects/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.aspects/src/test/resources/log4j.xml
rename to spring-aspects/src/test/resources/log4j.xml
diff --git a/org.springframework.aspects/template.mf b/spring-aspects/template.mf
similarity index 100%
rename from org.springframework.aspects/template.mf
rename to spring-aspects/template.mf
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java
rename to spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanInstantiationException.java b/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/BeanInstantiationException.java
rename to spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
rename to spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
rename to spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataElement.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataElement.java
rename to spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/BeanUtils.java
rename to spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapper.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapper.java
rename to spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
rename to spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeansException.java b/spring-beans/src/main/java/org/springframework/beans/BeansException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/BeansException.java
rename to spring-beans/src/main/java/org/springframework/beans/BeansException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java b/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java
rename to spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/ConfigurablePropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/ConfigurablePropertyAccessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/ConfigurablePropertyAccessor.java
rename to spring-beans/src/main/java/org/springframework/beans/ConfigurablePropertyAccessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
rename to spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
rename to spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
rename to spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/FatalBeanException.java b/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/FatalBeanException.java
rename to spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
rename to spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/InvalidPropertyException.java b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/InvalidPropertyException.java
rename to spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/Mergeable.java b/spring-beans/src/main/java/org/springframework/beans/Mergeable.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/Mergeable.java
rename to spring-beans/src/main/java/org/springframework/beans/Mergeable.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/MethodInvocationException.java b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/MethodInvocationException.java
rename to spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/MutablePropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
rename to spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java
rename to spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java
rename to spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java b/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java
rename to spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyAccessException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyAccessException.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyAccessor.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyAccessorFactory.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyAccessorFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyAccessorFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyMatches.java b/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyMatches.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyValue.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyValue.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyValues.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyValues.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyValuesEditor.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValuesEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/PropertyValuesEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/PropertyValuesEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/SimpleTypeConverter.java b/spring-beans/src/main/java/org/springframework/beans/SimpleTypeConverter.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/SimpleTypeConverter.java
rename to spring-beans/src/main/java/org/springframework/beans/SimpleTypeConverter.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverter.java b/spring-beans/src/main/java/org/springframework/beans/TypeConverter.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/TypeConverter.java
rename to spring-beans/src/main/java/org/springframework/beans/TypeConverter.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java b/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
rename to spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/TypeMismatchException.java b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/TypeMismatchException.java
rename to spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java
rename to spring-beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/annotation/package-info.java b/spring-beans/src/main/java/org/springframework/beans/annotation/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/annotation/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/annotation/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/Aware.java b/spring-beans/src/main/java/org/springframework/beans/factory/Aware.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/Aware.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/Aware.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java b/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/DisposableBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/DisposableBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/FactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/FactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/InitializingBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/InitializingBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/NamedBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/NamedBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/NamedBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/NamedBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/NoSuchBeanDefinitionException.java b/spring-beans/src/main/java/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/el/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/access/el/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/access/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/access/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Autowire.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowire.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Autowire.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowire.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Qualifier.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Qualifier.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Qualifier.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/Qualifier.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Required.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Value.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Value.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Value.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/Value.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/annotation/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/DeprecatedBeanWarner.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DeprecatedBeanWarner.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/DeprecatedBeanWarner.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/DeprecatedBeanWarner.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareAttributeHolder.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareAttributeHolder.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareAttributeHolder.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareAttributeHolder.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertiesFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertiesFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertiesFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/PropertiesFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/Scope.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/Scope.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/config/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/config/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/DefaultsDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/DefaultsDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/DefaultsDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/DefaultsDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/Location.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/Location.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ReaderContext.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ReaderContext.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ReaderContext.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/ReaderContext.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ReaderEventListener.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ReaderEventListener.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ReaderEventListener.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/ReaderEventListener.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/parsing/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistryPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistryPostProcessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistryPostProcessor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistryPostProcessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanNameGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanNameGenerator.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanNameGenerator.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/BeanNameGenerator.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MergedBeanDefinitionPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MergedBeanDefinitionPostProcessor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MergedBeanDefinitionPostProcessor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/MergedBeanDefinitionPostProcessor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleBeanDefinitionRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleBeanDefinitionRegistry.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleBeanDefinitionRegistry.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleBeanDefinitionRegistry.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/support/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/wiring/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/wiring/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/wiring/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParser.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParser.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParser.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/ParserContext.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/ParserContext.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/ParserContext.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/ParserContext.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/XmlReaderContext.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlReaderContext.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/XmlReaderContext.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlReaderContext.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/xml/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/package-info.java b/spring-beans/src/main/java/org/springframework/beans/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java b/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java
rename to spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/support/PagedListHolder.java b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
rename to spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/support/PropertyComparator.java b/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
rename to spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java b/spring-beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java
rename to spring-beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/support/SortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/support/SortDefinition.java
rename to spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/support/package-info.java b/spring-beans/src/main/java/org/springframework/beans/support/package-info.java
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/support/package-info.java
rename to spring-beans/src/main/java/org/springframework/beans/support/package-info.java
diff --git a/org.springframework.beans/src/main/java/overview.html b/spring-beans/src/main/java/overview.html
similarity index 100%
rename from org.springframework.beans/src/main/java/overview.html
rename to spring-beans/src/main/java/overview.html
diff --git a/org.springframework.beans/src/main/resources/META-INF/spring.handlers b/spring-beans/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from org.springframework.beans/src/main/resources/META-INF/spring.handlers
rename to spring-beans/src/main/resources/META-INF/spring.handlers
diff --git a/org.springframework.beans/src/main/resources/META-INF/spring.schemas b/spring-beans/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from org.springframework.beans/src/main/resources/META-INF/spring.schemas
rename to spring-beans/src/main/resources/META-INF/spring.schemas
diff --git a/org.springframework.beans/src/main/resources/META-INF/spring.tooling b/spring-beans/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from org.springframework.beans/src/main/resources/META-INF/spring.tooling
rename to spring-beans/src/main/resources/META-INF/spring.tooling
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.5.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.5.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.5.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.5.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.gif b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.gif
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.gif
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.gif
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.0.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.0.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.0.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.5.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.5.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.5.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.5.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.0.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.0.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.0.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.1.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.1.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.1.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util.gif b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util.gif
similarity index 100%
rename from org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util.gif
rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util.gif
diff --git a/org.springframework.beans/src/test/java/com/foo/Component.java b/spring-beans/src/test/java/com/foo/Component.java
similarity index 100%
rename from org.springframework.beans/src/test/java/com/foo/Component.java
rename to spring-beans/src/test/java/com/foo/Component.java
diff --git a/org.springframework.beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java
rename to spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java
diff --git a/org.springframework.beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
similarity index 100%
rename from org.springframework.beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
rename to spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
diff --git a/org.springframework.beans/src/test/java/com/foo/ComponentFactoryBean.java b/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/com/foo/ComponentFactoryBean.java
rename to spring-beans/src/test/java/com/foo/ComponentFactoryBean.java
diff --git a/org.springframework.beans/src/test/java/com/foo/ComponentNamespaceHandler.java b/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java
similarity index 100%
rename from org.springframework.beans/src/test/java/com/foo/ComponentNamespaceHandler.java
rename to spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
rename to spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
rename to spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
rename to spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
rename to spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
rename to spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
rename to spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java b/spring-beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java
rename to spring-beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
rename to spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
rename to spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java
rename to spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/PropertyAccessorUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/PropertyAccessorUtilsTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/PropertyAccessorUtilsTests.java
rename to spring-beans/src/test/java/org/springframework/beans/PropertyAccessorUtilsTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/annotation/AnnotationBeanWiringInfoResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/annotation/AnnotationBeanWiringInfoResolverTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/annotation/AnnotationBeanWiringInfoResolverTests.java
rename to spring-beans/src/test/java/org/springframework/beans/annotation/AnnotationBeanWiringInfoResolverTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/Spr5475Tests.java b/spring-beans/src/test/java/org/springframework/beans/factory/Spr5475Tests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/Spr5475Tests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/Spr5475Tests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CommonsLogFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CommonsLogFactoryBeanTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CommonsLogFactoryBeanTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/CommonsLogFactoryBeanTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/MyDeprecatedBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/MyDeprecatedBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/MyDeprecatedBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/MyDeprecatedBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.properties b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.properties
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.properties
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.properties
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntryTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntryTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntryTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/ParseStateTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/ParseStateTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/ParseStateTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/parsing/ParseStateTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/PropertyEntryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PropertyEntryTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/PropertyEntryTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/parsing/PropertyEntryTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml b/spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/callbacks.xml b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/callbacks.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/callbacks.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/security/callbacks.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/policy.all b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/policy.all
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/policy.all
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/security/policy.all
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/wiring/BeanWiringInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanWiringInfoTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/wiring/BeanWiringInfoTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanWiringInfoTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolverTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolverTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolverTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/FileEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/FileEditorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/FileEditorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/FileEditorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/InputStreamEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/InputStreamEditorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/InputStreamEditorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/InputStreamEditorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.properties b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.properties
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.properties
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.properties
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountryDialect_en_GB_GLASGOW.properties b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountryDialect_en_GB_GLASGOW.properties
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountryDialect_en_GB_GLASGOW.properties
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountryDialect_en_GB_GLASGOW.properties
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountry_en_GB.properties b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountry_en_GB.properties
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountry_en_GB.properties
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountry_en_GB.properties
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLang_en.properties b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLang_en.properties
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLang_en.properties
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLang_en.properties
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/support/DerivedFromProtectedBaseBean.java b/spring-beans/src/test/java/org/springframework/beans/support/DerivedFromProtectedBaseBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/support/DerivedFromProtectedBaseBean.java
rename to spring-beans/src/test/java/org/springframework/beans/support/DerivedFromProtectedBaseBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
rename to spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/support/ProtectedBaseBean.java b/spring-beans/src/test/java/org/springframework/beans/support/ProtectedBaseBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/beans/support/ProtectedBaseBean.java
rename to spring-beans/src/test/java/org/springframework/beans/support/ProtectedBaseBean.java
diff --git a/org.springframework.beans/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-beans/src/test/java/org/springframework/util/SerializationTestUtils.java
similarity index 100%
rename from org.springframework.beans/src/test/java/org/springframework/util/SerializationTestUtils.java
rename to spring-beans/src/test/java/org/springframework/util/SerializationTestUtils.java
diff --git a/org.springframework.beans/src/test/java/test/beans/BooleanTestBean.java b/spring-beans/src/test/java/test/beans/BooleanTestBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/BooleanTestBean.java
rename to spring-beans/src/test/java/test/beans/BooleanTestBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/Colour.java b/spring-beans/src/test/java/test/beans/Colour.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/Colour.java
rename to spring-beans/src/test/java/test/beans/Colour.java
diff --git a/org.springframework.beans/src/test/java/test/beans/CustomEnum.java b/spring-beans/src/test/java/test/beans/CustomEnum.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/CustomEnum.java
rename to spring-beans/src/test/java/test/beans/CustomEnum.java
diff --git a/org.springframework.beans/src/test/java/test/beans/DerivedTestBean.java b/spring-beans/src/test/java/test/beans/DerivedTestBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/DerivedTestBean.java
rename to spring-beans/src/test/java/test/beans/DerivedTestBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/DummyBean.java b/spring-beans/src/test/java/test/beans/DummyBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/DummyBean.java
rename to spring-beans/src/test/java/test/beans/DummyBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/DummyFactory.java b/spring-beans/src/test/java/test/beans/DummyFactory.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/DummyFactory.java
rename to spring-beans/src/test/java/test/beans/DummyFactory.java
diff --git a/org.springframework.beans/src/test/java/test/beans/GenericBean.java b/spring-beans/src/test/java/test/beans/GenericBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/GenericBean.java
rename to spring-beans/src/test/java/test/beans/GenericBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/GenericIntegerBean.java b/spring-beans/src/test/java/test/beans/GenericIntegerBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/GenericIntegerBean.java
rename to spring-beans/src/test/java/test/beans/GenericIntegerBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/GenericSetOfIntegerBean.java b/spring-beans/src/test/java/test/beans/GenericSetOfIntegerBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/GenericSetOfIntegerBean.java
rename to spring-beans/src/test/java/test/beans/GenericSetOfIntegerBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/INestedTestBean.java b/spring-beans/src/test/java/test/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/INestedTestBean.java
rename to spring-beans/src/test/java/test/beans/INestedTestBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/IOther.java b/spring-beans/src/test/java/test/beans/IOther.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/IOther.java
rename to spring-beans/src/test/java/test/beans/IOther.java
diff --git a/org.springframework.beans/src/test/java/test/beans/ITestBean.java b/spring-beans/src/test/java/test/beans/ITestBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/ITestBean.java
rename to spring-beans/src/test/java/test/beans/ITestBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/IndexedTestBean.java b/spring-beans/src/test/java/test/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/IndexedTestBean.java
rename to spring-beans/src/test/java/test/beans/IndexedTestBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/LifecycleBean.java b/spring-beans/src/test/java/test/beans/LifecycleBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/LifecycleBean.java
rename to spring-beans/src/test/java/test/beans/LifecycleBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/NestedTestBean.java b/spring-beans/src/test/java/test/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/NestedTestBean.java
rename to spring-beans/src/test/java/test/beans/NestedTestBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/NumberTestBean.java b/spring-beans/src/test/java/test/beans/NumberTestBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/NumberTestBean.java
rename to spring-beans/src/test/java/test/beans/NumberTestBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/PackageLevelVisibleBean.java b/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/PackageLevelVisibleBean.java
rename to spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java
diff --git a/org.springframework.beans/src/test/java/test/beans/TestBean.java b/spring-beans/src/test/java/test/beans/TestBean.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/beans/TestBean.java
rename to spring-beans/src/test/java/test/beans/TestBean.java
diff --git a/org.springframework.beans/src/test/java/test/util/TestResourceUtils.java b/spring-beans/src/test/java/test/util/TestResourceUtils.java
similarity index 100%
rename from org.springframework.beans/src/test/java/test/util/TestResourceUtils.java
rename to spring-beans/src/test/java/test/util/TestResourceUtils.java
diff --git a/org.springframework.beans/src/test/resources/META-INF/spring.handlers b/spring-beans/src/test/resources/META-INF/spring.handlers
similarity index 100%
rename from org.springframework.beans/src/test/resources/META-INF/spring.handlers
rename to spring-beans/src/test/resources/META-INF/spring.handlers
diff --git a/org.springframework.beans/src/test/resources/META-INF/spring.schemas b/spring-beans/src/test/resources/META-INF/spring.schemas
similarity index 100%
rename from org.springframework.beans/src/test/resources/META-INF/spring.schemas
rename to spring-beans/src/test/resources/META-INF/spring.schemas
diff --git a/org.springframework.beans/src/test/resources/com/foo/component-config.xml b/spring-beans/src/test/resources/com/foo/component-config.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/com/foo/component-config.xml
rename to spring-beans/src/test/resources/com/foo/component-config.xml
diff --git a/org.springframework.beans/src/test/resources/com/foo/component.xsd b/spring-beans/src/test/resources/com/foo/component.xsd
similarity index 100%
rename from org.springframework.beans/src/test/resources/com/foo/component.xsd
rename to spring-beans/src/test/resources/com/foo/component.xsd
diff --git a/org.springframework.beans/src/test/resources/log4j.xml b/spring-beans/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/log4j.xml
rename to spring-beans/src/test/resources/log4j.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties b/spring-beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties
rename to spring-beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties b/spring-beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties
rename to spring-beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties b/spring-beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties
rename to spring-beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/import.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/import.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/import.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/import.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/test.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/test.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/util.properties b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/util.properties
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/util.properties
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/util.properties
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml
rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml
diff --git a/org.springframework.beans/template.mf b/spring-beans/template.mf
similarity index 100%
rename from org.springframework.beans/template.mf
rename to spring-beans/template.mf
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/MailAuthenticationException.java b/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/MailAuthenticationException.java
rename to spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/MailException.java b/spring-context-support/src/main/java/org/springframework/mail/MailException.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/MailException.java
rename to spring-context-support/src/main/java/org/springframework/mail/MailException.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/MailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/MailMessage.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/MailMessage.java
rename to spring-context-support/src/main/java/org/springframework/mail/MailMessage.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/MailParseException.java b/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/MailParseException.java
rename to spring-context-support/src/main/java/org/springframework/mail/MailParseException.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/MailPreparationException.java b/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/MailPreparationException.java
rename to spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/MailSendException.java b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/MailSendException.java
rename to spring-context-support/src/main/java/org/springframework/mail/MailSendException.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/MailSender.java b/spring-context-support/src/main/java/org/springframework/mail/MailSender.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/MailSender.java
rename to spring-context-support/src/main/java/org/springframework/mail/MailSender.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/SimpleMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/SimpleMailMessage.java
rename to spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
rename to spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
rename to spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
rename to spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
rename to spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
rename to spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
rename to spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
rename to spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
rename to spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/javamail/mime.types b/spring-context-support/src/main/java/org/springframework/mail/javamail/mime.types
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/javamail/mime.types
rename to spring-context-support/src/main/java/org/springframework/mail/javamail/mime.types
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/javamail/package-info.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/package-info.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/javamail/package-info.java
rename to spring-context-support/src/main/java/org/springframework/mail/javamail/package-info.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/mail/package-info.java b/spring-context-support/src/main/java/org/springframework/mail/package-info.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/mail/package-info.java
rename to spring-context-support/src/main/java/org/springframework/mail/package-info.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/package-info.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/package-info.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/package-info.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/commonj/package-info.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SchedulerContextAware.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerContextAware.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SchedulerContextAware.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerContextAware.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/package-info.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/package-info.java
rename to spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java
rename to spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java
rename to spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java
rename to spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java
rename to spring-context-support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/freemarker/package-info.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/freemarker/package-info.java
rename to spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java b/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java
rename to spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/jasperreports/package-info.java b/spring-context-support/src/main/java/org/springframework/ui/jasperreports/package-info.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/jasperreports/package-info.java
rename to spring-context-support/src/main/java/org/springframework/ui/jasperreports/package-info.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java
rename to spring-context-support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/velocity/SpringResourceLoader.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/SpringResourceLoader.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/velocity/SpringResourceLoader.java
rename to spring-context-support/src/main/java/org/springframework/ui/velocity/SpringResourceLoader.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java
rename to spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java
rename to spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/velocity/VelocityEngineUtils.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineUtils.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/velocity/VelocityEngineUtils.java
rename to spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineUtils.java
diff --git a/org.springframework.context.support/src/main/java/org/springframework/ui/velocity/package-info.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/package-info.java
similarity index 100%
rename from org.springframework.context.support/src/main/java/org/springframework/ui/velocity/package-info.java
rename to spring-context-support/src/main/java/org/springframework/ui/velocity/package-info.java
diff --git a/org.springframework.context.support/src/main/java/overview.html b/spring-context-support/src/main/java/overview.html
similarity index 100%
rename from org.springframework.context.support/src/main/java/overview.html
rename to spring-context-support/src/main/java/overview.html
diff --git a/org.springframework.context.support/src/main/resources/.gitignore b/spring-context-support/src/main/resources/.gitignore
similarity index 100%
rename from org.springframework.context.support/src/main/resources/.gitignore
rename to spring-context-support/src/main/resources/.gitignore
diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/Colour.java b/spring-context-support/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/beans/Colour.java
rename to spring-context-support/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/IOther.java b/spring-context-support/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/beans/IOther.java
rename to spring-context-support/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/ITestBean.java b/spring-context-support/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-context-support/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-context-support/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/TestBean.java b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/beans/TestBean.java
rename to spring-context-support/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java b/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java
rename to spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMapTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMapTests.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMapTests.java
rename to spring-context-support/src/test/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMapTests.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
rename to spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
rename to spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java b/spring-context-support/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
rename to spring-context-support/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java
rename to spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/scheduling/quartz/QuartzSchedulerLifecycleTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSchedulerLifecycleTests.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/scheduling/quartz/QuartzSchedulerLifecycleTests.java
rename to spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSchedulerLifecycleTests.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
rename to spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/scheduling/quartz/QuartzTestBean.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzTestBean.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/scheduling/quartz/QuartzTestBean.java
rename to spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzTestBean.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
rename to spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/PersonBean.java b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
rename to spring-context-support/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
diff --git a/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/ProductBean.java b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
similarity index 100%
rename from org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
rename to spring-context-support/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
diff --git a/org.springframework.context.support/src/test/resources/log4j.xml b/spring-context-support/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.context.support/src/test/resources/log4j.xml
rename to spring-context-support/src/test/resources/log4j.xml
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/mail/javamail/test.mime.types b/spring-context-support/src/test/resources/org/springframework/mail/javamail/test.mime.types
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/mail/javamail/test.mime.types
rename to spring-context-support/src/test/resources/org/springframework/mail/javamail/test.mime.types
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml
rename to spring-context-support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml
rename to spring-context-support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml
rename to spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml
rename to spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/quartz-hsql.sql b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartz-hsql.sql
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/quartz-hsql.sql
rename to spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartz-hsql.sql
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml
rename to spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml
rename to spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml
rename to spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper b/spring-context-support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper
rename to spring-context-support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml b/spring-context-support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml
rename to spring-context-support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties b/spring-context-support/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties
rename to spring-context-support/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper b/spring-context-support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper
rename to spring-context-support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml b/spring-context-support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml
rename to spring-context-support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper b/spring-context-support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper
rename to spring-context-support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper
diff --git a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml b/spring-context-support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml
similarity index 100%
rename from org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml
rename to spring-context-support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml
diff --git a/org.springframework.context.support/template.mf b/spring-context-support/template.mf
similarity index 100%
rename from org.springframework.context.support/template.mf
rename to spring-context-support/template.mf
diff --git a/org.springframework.context/.springBeans b/spring-context/.springBeans
similarity index 100%
rename from org.springframework.context/.springBeans
rename to spring-context/.springBeans
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/Cache.java b/spring-context/src/main/java/org/springframework/cache/Cache.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/Cache.java
rename to spring-context/src/main/java/org/springframework/cache/Cache.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/CacheManager.java b/spring-context/src/main/java/org/springframework/cache/CacheManager.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/CacheManager.java
rename to spring-context/src/main/java/org/springframework/cache/CacheManager.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java b/spring-context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/CacheEvict.java b/spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/CacheEvict.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/CachePut.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/CachePut.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/Cacheable.java b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/Cacheable.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/Caching.java b/spring-context/src/main/java/org/springframework/cache/annotation/Caching.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/Caching.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/Caching.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/EnableCaching.java b/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java b/spring-context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java b/spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/package-info.java b/spring-context/src/main/java/org/springframework/cache/annotation/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/annotation/package-info.java
rename to spring-context/src/main/java/org/springframework/cache/annotation/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java
rename to spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java
rename to spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java
rename to spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/concurrent/package-info.java b/spring-context/src/main/java/org/springframework/cache/concurrent/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/concurrent/package-info.java
rename to spring-context/src/main/java/org/springframework/cache/concurrent/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java b/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java
rename to spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java b/spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
rename to spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/config/package-info.java b/spring-context/src/main/java/org/springframework/cache/config/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/config/package-info.java
rename to spring-context/src/main/java/org/springframework/cache/config/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java b/spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java
rename to spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java b/spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
rename to spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java b/spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
rename to spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java b/spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java
rename to spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/ehcache/package-info.java b/spring-context/src/main/java/org/springframework/cache/ehcache/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/ehcache/package-info.java
rename to spring-context/src/main/java/org/springframework/cache/ehcache/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java b/spring-context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheEvictOperation.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheEvictOperation.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheEvictOperation.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/CacheEvictOperation.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheOperationSource.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CachePutOperation.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CachePutOperation.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/CachePutOperation.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/CachePutOperation.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheableOperation.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheableOperation.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheableOperation.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/CacheableOperation.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java b/spring-context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/ExpressionEvaluator.java b/spring-context/src/main/java/org/springframework/cache/interceptor/ExpressionEvaluator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/ExpressionEvaluator.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/ExpressionEvaluator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/KeyGenerator.java b/spring-context/src/main/java/org/springframework/cache/interceptor/KeyGenerator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/KeyGenerator.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/KeyGenerator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/LazyParamAwareEvaluationContext.java b/spring-context/src/main/java/org/springframework/cache/interceptor/LazyParamAwareEvaluationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/LazyParamAwareEvaluationContext.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/LazyParamAwareEvaluationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/package-info.java b/spring-context/src/main/java/org/springframework/cache/interceptor/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/interceptor/package-info.java
rename to spring-context/src/main/java/org/springframework/cache/interceptor/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/package-info.java b/spring-context/src/main/java/org/springframework/cache/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/package-info.java
rename to spring-context/src/main/java/org/springframework/cache/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java b/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java
rename to spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/support/CompositeCacheManager.java b/spring-context/src/main/java/org/springframework/cache/support/CompositeCacheManager.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/support/CompositeCacheManager.java
rename to spring-context/src/main/java/org/springframework/cache/support/CompositeCacheManager.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/support/NoOpCacheManager.java b/spring-context/src/main/java/org/springframework/cache/support/NoOpCacheManager.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/support/NoOpCacheManager.java
rename to spring-context/src/main/java/org/springframework/cache/support/NoOpCacheManager.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/support/SimpleCacheManager.java b/spring-context/src/main/java/org/springframework/cache/support/SimpleCacheManager.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/support/SimpleCacheManager.java
rename to spring-context/src/main/java/org/springframework/cache/support/SimpleCacheManager.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java b/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
rename to spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
diff --git a/org.springframework.context/src/main/java/org/springframework/cache/support/package-info.java b/spring-context/src/main/java/org/springframework/cache/support/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/cache/support/package-info.java
rename to spring-context/src/main/java/org/springframework/cache/support/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/ApplicationContext.java b/spring-context/src/main/java/org/springframework/context/ApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/ApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/ApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/ApplicationContextAware.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/ApplicationContextAware.java
rename to spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/ApplicationContextException.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/ApplicationContextException.java
rename to spring-context/src/main/java/org/springframework/context/ApplicationContextException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/ApplicationContextInitializer.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextInitializer.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/ApplicationContextInitializer.java
rename to spring-context/src/main/java/org/springframework/context/ApplicationContextInitializer.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/ApplicationEvent.java b/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/ApplicationEvent.java
rename to spring-context/src/main/java/org/springframework/context/ApplicationEvent.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/ApplicationEventPublisher.java b/spring-context/src/main/java/org/springframework/context/ApplicationEventPublisher.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/ApplicationEventPublisher.java
rename to spring-context/src/main/java/org/springframework/context/ApplicationEventPublisher.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/ApplicationEventPublisherAware.java b/spring-context/src/main/java/org/springframework/context/ApplicationEventPublisherAware.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/ApplicationEventPublisherAware.java
rename to spring-context/src/main/java/org/springframework/context/ApplicationEventPublisherAware.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/ApplicationListener.java b/spring-context/src/main/java/org/springframework/context/ApplicationListener.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/ApplicationListener.java
rename to spring-context/src/main/java/org/springframework/context/ApplicationListener.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java b/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/EmbeddedValueResolverAware.java b/spring-context/src/main/java/org/springframework/context/EmbeddedValueResolverAware.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/EmbeddedValueResolverAware.java
rename to spring-context/src/main/java/org/springframework/context/EmbeddedValueResolverAware.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/EnvironmentAware.java b/spring-context/src/main/java/org/springframework/context/EnvironmentAware.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/EnvironmentAware.java
rename to spring-context/src/main/java/org/springframework/context/EnvironmentAware.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/HierarchicalMessageSource.java b/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
rename to spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/Lifecycle.java b/spring-context/src/main/java/org/springframework/context/Lifecycle.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/Lifecycle.java
rename to spring-context/src/main/java/org/springframework/context/Lifecycle.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/LifecycleProcessor.java b/spring-context/src/main/java/org/springframework/context/LifecycleProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/LifecycleProcessor.java
rename to spring-context/src/main/java/org/springframework/context/LifecycleProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/MessageSource.java b/spring-context/src/main/java/org/springframework/context/MessageSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/MessageSource.java
rename to spring-context/src/main/java/org/springframework/context/MessageSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/MessageSourceAware.java b/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/MessageSourceAware.java
rename to spring-context/src/main/java/org/springframework/context/MessageSourceAware.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/MessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/MessageSourceResolvable.java
rename to spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/NoSuchMessageException.java b/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/NoSuchMessageException.java
rename to spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/Phased.java b/spring-context/src/main/java/org/springframework/context/Phased.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/Phased.java
rename to spring-context/src/main/java/org/springframework/context/Phased.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/ResourceLoaderAware.java b/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/ResourceLoaderAware.java
rename to spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/SmartLifecycle.java b/spring-context/src/main/java/org/springframework/context/SmartLifecycle.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/SmartLifecycle.java
rename to spring-context/src/main/java/org/springframework/context/SmartLifecycle.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
rename to spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java b/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
rename to spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java b/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java
rename to spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java b/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java
rename to spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/access/package-info.java b/spring-context/src/main/java/org/springframework/context/access/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/access/package-info.java
rename to spring-context/src/main/java/org/springframework/context/access/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AdviceMode.java b/spring-context/src/main/java/org/springframework/context/annotation/AdviceMode.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/AdviceMode.java
rename to spring-context/src/main/java/org/springframework/context/annotation/AdviceMode.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AdviceModeImportSelector.java b/spring-context/src/main/java/org/springframework/context/annotation/AdviceModeImportSelector.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/AdviceModeImportSelector.java
rename to spring-context/src/main/java/org/springframework/context/annotation/AdviceModeImportSelector.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
rename to spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
rename to spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
rename to spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
rename to spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AspectJAutoProxyRegistrar.java b/spring-context/src/main/java/org/springframework/context/annotation/AspectJAutoProxyRegistrar.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/AspectJAutoProxyRegistrar.java
rename to spring-context/src/main/java/org/springframework/context/annotation/AspectJAutoProxyRegistrar.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java b/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
rename to spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Bean.java b/spring-context/src/main/java/org/springframework/context/annotation/Bean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/Bean.java
rename to spring-context/src/main/java/org/springframework/context/annotation/Bean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/BeanAnnotationHelper.java b/spring-context/src/main/java/org/springframework/context/annotation/BeanAnnotationHelper.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/BeanAnnotationHelper.java
rename to spring-context/src/main/java/org/springframework/context/annotation/BeanAnnotationHelper.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethod.java b/spring-context/src/main/java/org/springframework/context/annotation/BeanMethod.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethod.java
rename to spring-context/src/main/java/org/springframework/context/annotation/BeanMethod.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
rename to spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ComponentScan.java b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ComponentScan.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Configuration.java b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/Configuration.java
rename to spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationMethod.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationMethod.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationMethod.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ConfigurationMethod.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConflictingBeanDefinitionException.java b/spring-context/src/main/java/org/springframework/context/annotation/ConflictingBeanDefinitionException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ConflictingBeanDefinitionException.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ConflictingBeanDefinitionException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/DependsOn.java b/spring-context/src/main/java/org/springframework/context/annotation/DependsOn.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/DependsOn.java
rename to spring-context/src/main/java/org/springframework/context/annotation/DependsOn.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java b/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java
rename to spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/EnableLoadTimeWeaving.java b/spring-context/src/main/java/org/springframework/context/annotation/EnableLoadTimeWeaving.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/EnableLoadTimeWeaving.java
rename to spring-context/src/main/java/org/springframework/context/annotation/EnableLoadTimeWeaving.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/FilterType.java b/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/FilterType.java
rename to spring-context/src/main/java/org/springframework/context/annotation/FilterType.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Import.java b/spring-context/src/main/java/org/springframework/context/annotation/Import.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/Import.java
rename to spring-context/src/main/java/org/springframework/context/annotation/Import.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ImportAware.java b/spring-context/src/main/java/org/springframework/context/annotation/ImportAware.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ImportAware.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ImportAware.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ImportBeanDefinitionRegistrar.java b/spring-context/src/main/java/org/springframework/context/annotation/ImportBeanDefinitionRegistrar.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ImportBeanDefinitionRegistrar.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ImportBeanDefinitionRegistrar.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ImportResource.java b/spring-context/src/main/java/org/springframework/context/annotation/ImportResource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ImportResource.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ImportResource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ImportSelector.java b/spring-context/src/main/java/org/springframework/context/annotation/ImportSelector.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ImportSelector.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ImportSelector.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
rename to spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Lazy.java b/spring-context/src/main/java/org/springframework/context/annotation/Lazy.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/Lazy.java
rename to spring-context/src/main/java/org/springframework/context/annotation/Lazy.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java b/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java
rename to spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfigurer.java b/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfigurer.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfigurer.java
rename to spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfigurer.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Primary.java b/spring-context/src/main/java/org/springframework/context/annotation/Primary.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/Primary.java
rename to spring-context/src/main/java/org/springframework/context/annotation/Primary.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Profile.java b/spring-context/src/main/java/org/springframework/context/annotation/Profile.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/Profile.java
rename to spring-context/src/main/java/org/springframework/context/annotation/Profile.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ProfileHelper.java b/spring-context/src/main/java/org/springframework/context/annotation/ProfileHelper.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ProfileHelper.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ProfileHelper.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/PropertySource.java b/spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/PropertySource.java
rename to spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Role.java b/spring-context/src/main/java/org/springframework/context/annotation/Role.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/Role.java
rename to spring-context/src/main/java/org/springframework/context/annotation/Role.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ScannedGenericBeanDefinition.java b/spring-context/src/main/java/org/springframework/context/annotation/ScannedGenericBeanDefinition.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ScannedGenericBeanDefinition.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ScannedGenericBeanDefinition.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Scope.java b/spring-context/src/main/java/org/springframework/context/annotation/Scope.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/Scope.java
rename to spring-context/src/main/java/org/springframework/context/annotation/Scope.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ScopedProxyCreator.java b/spring-context/src/main/java/org/springframework/context/annotation/ScopedProxyCreator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ScopedProxyCreator.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ScopedProxyCreator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ScopedProxyMode.java b/spring-context/src/main/java/org/springframework/context/annotation/ScopedProxyMode.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ScopedProxyMode.java
rename to spring-context/src/main/java/org/springframework/context/annotation/ScopedProxyMode.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/package-info.java b/spring-context/src/main/java/org/springframework/context/annotation/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/annotation/package-info.java
rename to spring-context/src/main/java/org/springframework/context/annotation/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/AbstractPropertyLoadingBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/AbstractPropertyLoadingBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/config/AbstractPropertyLoadingBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/context/config/AbstractPropertyLoadingBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java b/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
rename to spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/LoadTimeWeaverBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/LoadTimeWeaverBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/config/LoadTimeWeaverBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/context/config/LoadTimeWeaverBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/PropertyPlaceholderBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/PropertyPlaceholderBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/config/PropertyPlaceholderBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/context/config/PropertyPlaceholderBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/package-info.java b/spring-context/src/main/java/org/springframework/context/config/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/config/package-info.java
rename to spring-context/src/main/java/org/springframework/context/config/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
rename to spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
rename to spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/ApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationEventMulticaster.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/ApplicationEventMulticaster.java
rename to spring-context/src/main/java/org/springframework/context/event/ApplicationEventMulticaster.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/ContextClosedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
rename to spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
rename to spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/ContextStartedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
rename to spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
rename to spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java b/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
rename to spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java b/spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java
rename to spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
rename to spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/SmartApplicationListener.java b/spring-context/src/main/java/org/springframework/context/event/SmartApplicationListener.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/SmartApplicationListener.java
rename to spring-context/src/main/java/org/springframework/context/event/SmartApplicationListener.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/SourceFilteringListener.java b/spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/SourceFilteringListener.java
rename to spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/event/package-info.java b/spring-context/src/main/java/org/springframework/context/event/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/event/package-info.java
rename to spring-context/src/main/java/org/springframework/context/event/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java
rename to spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java
rename to spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java
rename to spring-context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java
rename to spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/expression/MapAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/expression/MapAccessor.java
rename to spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java b/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
rename to spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/expression/package-info.java b/spring-context/src/main/java/org/springframework/context/expression/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/expression/package-info.java
rename to spring-context/src/main/java/org/springframework/context/expression/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/i18n/LocaleContext.java b/spring-context/src/main/java/org/springframework/context/i18n/LocaleContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/i18n/LocaleContext.java
rename to spring-context/src/main/java/org/springframework/context/i18n/LocaleContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java b/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java
rename to spring-context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java b/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
rename to spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/i18n/package-info.java b/spring-context/src/main/java/org/springframework/context/i18n/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/i18n/package-info.java
rename to spring-context/src/main/java/org/springframework/context/i18n/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/package-info.java b/spring-context/src/main/java/org/springframework/context/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/package-info.java
rename to spring-context/src/main/java/org/springframework/context/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
rename to spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
rename to spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
rename to spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java b/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
rename to spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java b/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
rename to spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
rename to spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
rename to spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java
rename to spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/FileSystemXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/FileSystemXmlApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/FileSystemXmlApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/support/FileSystemXmlApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
rename to spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java
rename to spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/MessageSourceSupport.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceSupport.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/MessageSourceSupport.java
rename to spring-context/src/main/java/org/springframework/context/support/MessageSourceSupport.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
rename to spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
rename to spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java
rename to spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/SimpleThreadScope.java b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
rename to spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/StaticApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/StaticApplicationContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/StaticApplicationContext.java
rename to spring-context/src/main/java/org/springframework/context/support/StaticApplicationContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/StaticMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/StaticMessageSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/StaticMessageSource.java
rename to spring-context/src/main/java/org/springframework/context/support/StaticMessageSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/package-info.java b/spring-context/src/main/java/org/springframework/context/support/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/support/package-info.java
rename to spring-context/src/main/java/org/springframework/context/support/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java b/spring-context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java
rename to spring-context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
rename to spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java
rename to spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
rename to spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/context/weaving/package-info.java b/spring-context/src/main/java/org/springframework/context/weaving/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/weaving/package-info.java
rename to spring-context/src/main/java/org/springframework/context/weaving/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
rename to spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
rename to spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/EjbAccessException.java b/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
rename to spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
rename to spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
rename to spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
rename to spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
rename to spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/package-info.java b/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/access/package-info.java
rename to spring-context/src/main/java/org/springframework/ejb/access/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/AbstractJndiLocatingBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/AbstractJndiLocatingBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/config/AbstractJndiLocatingBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/ejb/config/AbstractJndiLocatingBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java b/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
rename to spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/package-info.java b/spring-context/src/main/java/org/springframework/ejb/config/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/config/package-info.java
rename to spring-context/src/main/java/org/springframework/ejb/config/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java
rename to spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/interceptor/package-info.java b/spring-context/src/main/java/org/springframework/ejb/interceptor/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/interceptor/package-info.java
rename to spring-context/src/main/java/org/springframework/ejb/interceptor/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
rename to spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
rename to spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
rename to spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
rename to spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
rename to spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
rename to spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/support/SmartSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/SmartSessionBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/support/SmartSessionBean.java
rename to spring-context/src/main/java/org/springframework/ejb/support/SmartSessionBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/support/package-info.java b/spring-context/src/main/java/org/springframework/ejb/support/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/support/package-info.java
rename to spring-context/src/main/java/org/springframework/ejb/support/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java
rename to spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/Formatter.java b/spring-context/src/main/java/org/springframework/format/Formatter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/Formatter.java
rename to spring-context/src/main/java/org/springframework/format/Formatter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/FormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/FormatterRegistrar.java
rename to spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/FormatterRegistry.java b/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/FormatterRegistry.java
rename to spring-context/src/main/java/org/springframework/format/FormatterRegistry.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/Parser.java b/spring-context/src/main/java/org/springframework/format/Parser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/Parser.java
rename to spring-context/src/main/java/org/springframework/format/Parser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/Printer.java b/spring-context/src/main/java/org/springframework/format/Printer.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/Printer.java
rename to spring-context/src/main/java/org/springframework/format/Printer.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java b/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
rename to spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/annotation/NumberFormat.java b/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/annotation/NumberFormat.java
rename to spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/annotation/package-info.java b/spring-context/src/main/java/org/springframework/format/annotation/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/annotation/package-info.java
rename to spring-context/src/main/java/org/springframework/format/annotation/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/DateFormatter.java b/spring-context/src/main/java/org/springframework/format/datetime/DateFormatter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/DateFormatter.java
rename to spring-context/src/main/java/org/springframework/format/datetime/DateFormatter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
rename to spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java
rename to spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java
rename to spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java
rename to spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java
rename to spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
rename to spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
rename to spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
rename to spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
rename to spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/package-info.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/joda/package-info.java
rename to spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/package-info.java b/spring-context/src/main/java/org/springframework/format/datetime/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/datetime/package-info.java
rename to spring-context/src/main/java/org/springframework/format/datetime/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java b/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
rename to spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/number/CurrencyFormatter.java b/spring-context/src/main/java/org/springframework/format/number/CurrencyFormatter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/number/CurrencyFormatter.java
rename to spring-context/src/main/java/org/springframework/format/number/CurrencyFormatter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
rename to spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/number/NumberFormatter.java b/spring-context/src/main/java/org/springframework/format/number/NumberFormatter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/number/NumberFormatter.java
rename to spring-context/src/main/java/org/springframework/format/number/NumberFormatter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/number/PercentFormatter.java b/spring-context/src/main/java/org/springframework/format/number/PercentFormatter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/number/PercentFormatter.java
rename to spring-context/src/main/java/org/springframework/format/number/PercentFormatter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/number/package-info.java b/spring-context/src/main/java/org/springframework/format/number/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/number/package-info.java
rename to spring-context/src/main/java/org/springframework/format/number/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/package-info.java b/spring-context/src/main/java/org/springframework/format/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/package-info.java
rename to spring-context/src/main/java/org/springframework/format/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java b/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java
rename to spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java
rename to spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
rename to spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/format/support/package-info.java b/spring-context/src/main/java/org/springframework/format/support/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/format/support/package-info.java
rename to spring-context/src/main/java/org/springframework/format/support/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/SimpleThrowawayClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleThrowawayClassLoader.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/SimpleThrowawayClassLoader.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/SimpleThrowawayClassLoader.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java b/spring-context/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/glassfish/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/glassfish/package-info.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/JBossClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossClassLoaderAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/JBossClassLoaderAdapter.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossClassLoaderAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/jboss/package-info.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/jboss/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/package-info.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/package-info.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java
rename to spring-context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/JmxException.java b/spring-context/src/main/java/org/springframework/jmx/JmxException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/JmxException.java
rename to spring-context/src/main/java/org/springframework/jmx/JmxException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java b/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
rename to spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java b/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java
rename to spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
rename to spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
rename to spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
rename to spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
rename to spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
rename to spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
rename to spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java b/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
rename to spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/access/package-info.java b/spring-context/src/main/java/org/springframework/jmx/access/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/access/package-info.java
rename to spring-context/src/main/java/org/springframework/jmx/access/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExportException.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
rename to spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java
rename to spring-context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExporter.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
rename to spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java
rename to spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java b/spring-context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java
rename to spring-context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/SpringModelMBean.java b/spring-context/src/main/java/org/springframework/jmx/export/SpringModelMBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/SpringModelMBean.java
rename to spring-context/src/main/java/org/springframework/jmx/export/SpringModelMBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java b/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
rename to spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java
rename to spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/AnnotationMBeanExporter.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationMBeanExporter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/AnnotationMBeanExporter.java
rename to spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationMBeanExporter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedAttribute.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedAttribute.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedAttribute.java
rename to spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedAttribute.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java
rename to spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotification.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotification.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotification.java
rename to spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotification.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotifications.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotifications.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotifications.java
rename to spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotifications.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperation.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperation.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperation.java
rename to spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperation.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
rename to spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java
rename to spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java
rename to spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/annotation/package-info.java
rename to spring-context/src/main/java/org/springframework/jmx/export/annotation/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java
rename to spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
rename to spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java
rename to spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
rename to spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
rename to spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java
rename to spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java
rename to spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java
rename to spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java
rename to spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java
rename to spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/package-info.java
rename to spring-context/src/main/java/org/springframework/jmx/export/assembler/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/AbstractJmxAttribute.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/AbstractJmxAttribute.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/AbstractJmxAttribute.java
rename to spring-context/src/main/java/org/springframework/jmx/export/metadata/AbstractJmxAttribute.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
rename to spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
rename to spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/JmxMetadataUtils.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxMetadataUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/JmxMetadataUtils.java
rename to spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxMetadataUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedAttribute.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedAttribute.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedAttribute.java
rename to spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedAttribute.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedMetric.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedMetric.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedMetric.java
rename to spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedMetric.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedNotification.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedNotification.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedNotification.java
rename to spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedNotification.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedOperation.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedOperation.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedOperation.java
rename to spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedOperation.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedOperationParameter.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedOperationParameter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedOperationParameter.java
rename to spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedOperationParameter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java
rename to spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/package-info.java
rename to spring-context/src/main/java/org/springframework/jmx/export/metadata/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
rename to spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
rename to spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
rename to spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java
rename to spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java
rename to spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/naming/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/naming/package-info.java
rename to spring-context/src/main/java/org/springframework/jmx/export/naming/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
rename to spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java
rename to spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisherAware.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisherAware.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisherAware.java
rename to spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisherAware.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java
rename to spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/notification/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/notification/package-info.java
rename to spring-context/src/main/java/org/springframework/jmx/export/notification/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/export/package-info.java
rename to spring-context/src/main/java/org/springframework/jmx/export/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/package-info.java b/spring-context/src/main/java/org/springframework/jmx/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/package-info.java
rename to spring-context/src/main/java/org/springframework/jmx/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java
rename to spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/JmxUtils.java b/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/support/JmxUtils.java
rename to spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/MBeanRegistrationSupport.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanRegistrationSupport.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/support/MBeanRegistrationSupport.java
rename to spring-context/src/main/java/org/springframework/jmx/support/MBeanRegistrationSupport.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
rename to spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
rename to spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/MetricType.java b/spring-context/src/main/java/org/springframework/jmx/support/MetricType.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/support/MetricType.java
rename to spring-context/src/main/java/org/springframework/jmx/support/MetricType.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java b/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
rename to spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java b/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java
rename to spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
rename to spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/package-info.java b/spring-context/src/main/java/org/springframework/jmx/support/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jmx/support/package-info.java
rename to spring-context/src/main/java/org/springframework/jmx/support/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiAccessor.java b/spring-context/src/main/java/org/springframework/jndi/JndiAccessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/JndiAccessor.java
rename to spring-context/src/main/java/org/springframework/jndi/JndiAccessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiCallback.java b/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/JndiCallback.java
rename to spring-context/src/main/java/org/springframework/jndi/JndiCallback.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
rename to spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java
rename to spring-context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java b/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java
rename to spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java
rename to spring-context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectLocator.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
rename to spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
rename to spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiPropertySource.java b/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/JndiPropertySource.java
rename to spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiTemplate.java b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/JndiTemplate.java
rename to spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java b/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java
rename to spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java b/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java
rename to spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/package-info.java b/spring-context/src/main/java/org/springframework/jndi/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/package-info.java
rename to spring-context/src/main/java/org/springframework/jndi/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
rename to spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/support/package-info.java b/spring-context/src/main/java/org/springframework/jndi/support/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/jndi/support/package-info.java
rename to spring-context/src/main/java/org/springframework/jndi/support/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/RemoteAccessException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteAccessException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/RemoteAccessException.java
rename to spring-context/src/main/java/org/springframework/remoting/RemoteAccessException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
rename to spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
rename to spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
rename to spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
rename to spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/package-info.java b/spring-context/src/main/java/org/springframework/remoting/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/package-info.java
rename to spring-context/src/main/java/org/springframework/remoting/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java b/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml
rename to spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/package-info.java b/spring-context/src/main/java/org/springframework/remoting/rmi/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/rmi/package-info.java
rename to spring-context/src/main/java/org/springframework/remoting/rmi/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
rename to spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/soap/package-info.java b/spring-context/src/main/java/org/springframework/remoting/soap/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/soap/package-info.java
rename to spring-context/src/main/java/org/springframework/remoting/soap/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
rename to spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
rename to spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
rename to spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteExporter.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
rename to spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
rename to spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
rename to spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedExporter.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedExporter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedExporter.java
rename to spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedExporter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationExecutor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationExecutor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationExecutor.java
rename to spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationExecutor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationFactory.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationFactory.java
rename to spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
rename to spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
rename to spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
rename to spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemotingSupport.java b/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
rename to spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
rename to spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
rename to spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/package-info.java b/spring-context/src/main/java/org/springframework/remoting/support/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/remoting/support/package-info.java
rename to spring-context/src/main/java/org/springframework/remoting/support/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
rename to spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/SchedulingException.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/SchedulingException.java
rename to spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
rename to spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/TaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/TaskScheduler.java
rename to spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/Trigger.java b/spring-context/src/main/java/org/springframework/scheduling/Trigger.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/Trigger.java
rename to spring-context/src/main/java/org/springframework/scheduling/Trigger.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/TriggerContext.java b/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/TriggerContext.java
rename to spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/Async.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/Async.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfiguration.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfiguration.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfiguration.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/annotation/package-info.java
rename to spring-context/src/main/java/org/springframework/scheduling/annotation/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
rename to spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
rename to spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
rename to spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/package-info.java
rename to spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
rename to spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
rename to spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java
rename to spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
rename to spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/config/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/config/package-info.java
rename to spring-context/src/main/java/org/springframework/scheduling/config/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/package-info.java
rename to spring-context/src/main/java/org/springframework/scheduling/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
rename to spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/support/CronTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/support/CronTrigger.java
rename to spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java
rename to spring-context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java
rename to spring-context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
rename to spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
rename to spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java b/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
rename to spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/support/TaskUtils.java b/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
rename to spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/support/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/support/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/support/package-info.java
rename to spring-context/src/main/java/org/springframework/scheduling/support/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java b/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java
rename to spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
rename to spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java b/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java
rename to spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
rename to spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
rename to spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/timer/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/timer/package-info.java
rename to spring-context/src/main/java/org/springframework/scheduling/timer/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/ScriptCompilationException.java b/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
rename to spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/ScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/ScriptFactory.java
rename to spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/ScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/ScriptSource.java
rename to spring-context/src/main/java/org/springframework/scripting/ScriptSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java
rename to spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java
rename to spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/bsh/package-info.java b/spring-context/src/main/java/org/springframework/scripting/bsh/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/bsh/package-info.java
rename to spring-context/src/main/java/org/springframework/scripting/bsh/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
rename to spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/config/LangNamespaceUtils.java b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/config/LangNamespaceUtils.java
rename to spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java
rename to spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java b/spring-context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java
rename to spring-context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/config/package-info.java b/spring-context/src/main/java/org/springframework/scripting/config/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/config/package-info.java
rename to spring-context/src/main/java/org/springframework/scripting/config/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java
rename to spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java
rename to spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/groovy/package-info.java b/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/groovy/package-info.java
rename to spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
rename to spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
rename to spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/jruby/package-info.java b/spring-context/src/main/java/org/springframework/scripting/jruby/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/jruby/package-info.java
rename to spring-context/src/main/java/org/springframework/scripting/jruby/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/package-info.java b/spring-context/src/main/java/org/springframework/scripting/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/package-info.java
rename to spring-context/src/main/java/org/springframework/scripting/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java b/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java
rename to spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java
rename to spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java b/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
rename to spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
rename to spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/support/package-info.java b/spring-context/src/main/java/org/springframework/scripting/support/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/support/package-info.java
rename to spring-context/src/main/java/org/springframework/scripting/support/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/stereotype/Component.java b/spring-context/src/main/java/org/springframework/stereotype/Component.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/stereotype/Component.java
rename to spring-context/src/main/java/org/springframework/stereotype/Component.java
diff --git a/org.springframework.context/src/main/java/org/springframework/stereotype/Controller.java b/spring-context/src/main/java/org/springframework/stereotype/Controller.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/stereotype/Controller.java
rename to spring-context/src/main/java/org/springframework/stereotype/Controller.java
diff --git a/org.springframework.context/src/main/java/org/springframework/stereotype/Repository.java b/spring-context/src/main/java/org/springframework/stereotype/Repository.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/stereotype/Repository.java
rename to spring-context/src/main/java/org/springframework/stereotype/Repository.java
diff --git a/org.springframework.context/src/main/java/org/springframework/stereotype/Service.java b/spring-context/src/main/java/org/springframework/stereotype/Service.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/stereotype/Service.java
rename to spring-context/src/main/java/org/springframework/stereotype/Service.java
diff --git a/org.springframework.context/src/main/java/org/springframework/stereotype/package-info.java b/spring-context/src/main/java/org/springframework/stereotype/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/stereotype/package-info.java
rename to spring-context/src/main/java/org/springframework/stereotype/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/ExtendedModelMap.java b/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/ExtendedModelMap.java
rename to spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/Model.java b/spring-context/src/main/java/org/springframework/ui/Model.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/Model.java
rename to spring-context/src/main/java/org/springframework/ui/Model.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/ModelMap.java b/spring-context/src/main/java/org/springframework/ui/ModelMap.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/ModelMap.java
rename to spring-context/src/main/java/org/springframework/ui/ModelMap.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
rename to spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/context/Theme.java b/spring-context/src/main/java/org/springframework/ui/context/Theme.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/context/Theme.java
rename to spring-context/src/main/java/org/springframework/ui/context/Theme.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/context/ThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/context/ThemeSource.java
rename to spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/context/package-info.java b/spring-context/src/main/java/org/springframework/ui/context/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/context/package-info.java
rename to spring-context/src/main/java/org/springframework/ui/context/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java
rename to spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
rename to spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java b/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java
rename to spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java b/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
rename to spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/context/support/package-info.java b/spring-context/src/main/java/org/springframework/ui/context/support/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/context/support/package-info.java
rename to spring-context/src/main/java/org/springframework/ui/context/support/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/package-info.java b/spring-context/src/main/java/org/springframework/ui/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ui/package-info.java
rename to spring-context/src/main/java/org/springframework/ui/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/AbstractBindingResult.java b/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/AbstractBindingResult.java
rename to spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/AbstractErrors.java b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/AbstractErrors.java
rename to spring-context/src/main/java/org/springframework/validation/AbstractErrors.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java b/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
rename to spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java b/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
rename to spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/BindException.java b/spring-context/src/main/java/org/springframework/validation/BindException.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/BindException.java
rename to spring-context/src/main/java/org/springframework/validation/BindException.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/BindingErrorProcessor.java b/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/BindingErrorProcessor.java
rename to spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/BindingResult.java b/spring-context/src/main/java/org/springframework/validation/BindingResult.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/BindingResult.java
rename to spring-context/src/main/java/org/springframework/validation/BindingResult.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/BindingResultUtils.java b/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/BindingResultUtils.java
rename to spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/DataBinder.java
rename to spring-context/src/main/java/org/springframework/validation/DataBinder.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java b/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
rename to spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java b/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
rename to spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/DirectFieldBindingResult.java b/spring-context/src/main/java/org/springframework/validation/DirectFieldBindingResult.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/DirectFieldBindingResult.java
rename to spring-context/src/main/java/org/springframework/validation/DirectFieldBindingResult.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/Errors.java b/spring-context/src/main/java/org/springframework/validation/Errors.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/Errors.java
rename to spring-context/src/main/java/org/springframework/validation/Errors.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/FieldError.java b/spring-context/src/main/java/org/springframework/validation/FieldError.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/FieldError.java
rename to spring-context/src/main/java/org/springframework/validation/FieldError.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/MapBindingResult.java b/spring-context/src/main/java/org/springframework/validation/MapBindingResult.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/MapBindingResult.java
rename to spring-context/src/main/java/org/springframework/validation/MapBindingResult.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/MessageCodesResolver.java b/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/MessageCodesResolver.java
rename to spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/ObjectError.java b/spring-context/src/main/java/org/springframework/validation/ObjectError.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/ObjectError.java
rename to spring-context/src/main/java/org/springframework/validation/ObjectError.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/SmartValidator.java b/spring-context/src/main/java/org/springframework/validation/SmartValidator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/SmartValidator.java
rename to spring-context/src/main/java/org/springframework/validation/SmartValidator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/ValidationUtils.java b/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/ValidationUtils.java
rename to spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/Validator.java b/spring-context/src/main/java/org/springframework/validation/Validator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/Validator.java
rename to spring-context/src/main/java/org/springframework/validation/Validator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/annotation/Validated.java b/spring-context/src/main/java/org/springframework/validation/annotation/Validated.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/annotation/Validated.java
rename to spring-context/src/main/java/org/springframework/validation/annotation/Validated.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/annotation/package-info.java b/spring-context/src/main/java/org/springframework/validation/annotation/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/annotation/package-info.java
rename to spring-context/src/main/java/org/springframework/validation/annotation/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
rename to spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
rename to spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
rename to spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
rename to spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
rename to spring-context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
rename to spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java
rename to spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
rename to spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
rename to spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/package-info.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/package-info.java
rename to spring-context/src/main/java/org/springframework/validation/beanvalidation/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/package-info.java b/spring-context/src/main/java/org/springframework/validation/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/package-info.java
rename to spring-context/src/main/java/org/springframework/validation/package-info.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
rename to spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/support/package-info.java b/spring-context/src/main/java/org/springframework/validation/support/package-info.java
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/validation/support/package-info.java
rename to spring-context/src/main/java/org/springframework/validation/support/package-info.java
diff --git a/org.springframework.context/src/main/java/overview.html b/spring-context/src/main/java/overview.html
similarity index 100%
rename from org.springframework.context/src/main/java/overview.html
rename to spring-context/src/main/java/overview.html
diff --git a/org.springframework.context/src/main/resources/META-INF/spring.handlers b/spring-context/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from org.springframework.context/src/main/resources/META-INF/spring.handlers
rename to spring-context/src/main/resources/META-INF/spring.handlers
diff --git a/org.springframework.context/src/main/resources/META-INF/spring.schemas b/spring-context/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from org.springframework.context/src/main/resources/META-INF/spring.schemas
rename to spring-context/src/main/resources/META-INF/spring.schemas
diff --git a/org.springframework.context/src/main/resources/META-INF/spring.tooling b/spring-context/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from org.springframework.context/src/main/resources/META-INF/spring.tooling
rename to spring-context/src/main/resources/META-INF/spring.tooling
diff --git a/org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd
rename to spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache.gif b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache.gif
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache.gif
rename to spring-context/src/main/resources/org/springframework/cache/config/spring-cache.gif
diff --git a/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd
rename to spring-context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-3.0.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.0.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-3.0.xsd
rename to spring-context/src/main/resources/org/springframework/context/config/spring-context-3.0.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd
rename to spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context.gif b/spring-context/src/main/resources/org/springframework/context/config/spring-context.gif
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/context/config/spring-context.gif
rename to spring-context/src/main/resources/org/springframework/context/config/spring-context.gif
diff --git a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.0.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-2.0.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.0.xsd
rename to spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-2.0.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd
rename to spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-3.0.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.0.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-3.0.xsd
rename to spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.0.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-3.1.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.1.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-3.1.xsd
rename to spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.1.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee.gif b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee.gif
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee.gif
rename to spring-context/src/main/resources/org/springframework/ejb/config/spring-jee.gif
diff --git a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
rename to spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.1.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.1.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.1.xsd
rename to spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.1.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task.gif b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.gif
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task.gif
rename to spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.gif
diff --git a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd
rename to spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd
rename to spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
rename to spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.1.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.1.xsd
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.1.xsd
rename to spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.1.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang.gif b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang.gif
similarity index 100%
rename from org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang.gif
rename to spring-context/src/main/resources/org/springframework/scripting/config/spring-lang.gif
diff --git a/org.springframework.context/src/test/java/example/profilescan/DevComponent.java b/spring-context/src/test/java/example/profilescan/DevComponent.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/profilescan/DevComponent.java
rename to spring-context/src/test/java/example/profilescan/DevComponent.java
diff --git a/org.springframework.context/src/test/java/example/profilescan/ProfileAnnotatedComponent.java b/spring-context/src/test/java/example/profilescan/ProfileAnnotatedComponent.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/profilescan/ProfileAnnotatedComponent.java
rename to spring-context/src/test/java/example/profilescan/ProfileAnnotatedComponent.java
diff --git a/org.springframework.context/src/test/java/example/profilescan/ProfileMetaAnnotatedComponent.java b/spring-context/src/test/java/example/profilescan/ProfileMetaAnnotatedComponent.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/profilescan/ProfileMetaAnnotatedComponent.java
rename to spring-context/src/test/java/example/profilescan/ProfileMetaAnnotatedComponent.java
diff --git a/org.springframework.context/src/test/java/example/scannable/AutowiredQualifierFooService.java b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/AutowiredQualifierFooService.java
rename to spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java
diff --git a/org.springframework.context/src/test/java/example/scannable/CustomComponent.java b/spring-context/src/test/java/example/scannable/CustomComponent.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/CustomComponent.java
rename to spring-context/src/test/java/example/scannable/CustomComponent.java
diff --git a/org.springframework.context/src/test/java/example/scannable/CustomStereotype.java b/spring-context/src/test/java/example/scannable/CustomStereotype.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/CustomStereotype.java
rename to spring-context/src/test/java/example/scannable/CustomStereotype.java
diff --git a/org.springframework.context/src/test/java/example/scannable/DefaultNamedComponent.java b/spring-context/src/test/java/example/scannable/DefaultNamedComponent.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/DefaultNamedComponent.java
rename to spring-context/src/test/java/example/scannable/DefaultNamedComponent.java
diff --git a/org.springframework.context/src/test/java/example/scannable/FooDao.java b/spring-context/src/test/java/example/scannable/FooDao.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/FooDao.java
rename to spring-context/src/test/java/example/scannable/FooDao.java
diff --git a/org.springframework.context/src/test/java/example/scannable/FooService.java b/spring-context/src/test/java/example/scannable/FooService.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/FooService.java
rename to spring-context/src/test/java/example/scannable/FooService.java
diff --git a/org.springframework.context/src/test/java/example/scannable/FooServiceImpl.java b/spring-context/src/test/java/example/scannable/FooServiceImpl.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/FooServiceImpl.java
rename to spring-context/src/test/java/example/scannable/FooServiceImpl.java
diff --git a/org.springframework.context/src/test/java/example/scannable/MessageBean.java b/spring-context/src/test/java/example/scannable/MessageBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/MessageBean.java
rename to spring-context/src/test/java/example/scannable/MessageBean.java
diff --git a/org.springframework.context/src/test/java/example/scannable/NamedComponent.java b/spring-context/src/test/java/example/scannable/NamedComponent.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/NamedComponent.java
rename to spring-context/src/test/java/example/scannable/NamedComponent.java
diff --git a/org.springframework.context/src/test/java/example/scannable/NamedStubDao.java b/spring-context/src/test/java/example/scannable/NamedStubDao.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/NamedStubDao.java
rename to spring-context/src/test/java/example/scannable/NamedStubDao.java
diff --git a/org.springframework.context/src/test/java/example/scannable/ScopedProxyTestBean.java b/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/ScopedProxyTestBean.java
rename to spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java
diff --git a/org.springframework.context/src/test/java/example/scannable/ServiceInvocationCounter.java b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/ServiceInvocationCounter.java
rename to spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java
diff --git a/org.springframework.context/src/test/java/example/scannable/StubFooDao.java b/spring-context/src/test/java/example/scannable/StubFooDao.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/StubFooDao.java
rename to spring-context/src/test/java/example/scannable/StubFooDao.java
diff --git a/org.springframework.context/src/test/java/example/scannable/_package.java b/spring-context/src/test/java/example/scannable/_package.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable/_package.java
rename to spring-context/src/test/java/example/scannable/_package.java
diff --git a/org.springframework.context/src/test/java/example/scannable_scoped/CustomScopeAnnotationBean.java b/spring-context/src/test/java/example/scannable_scoped/CustomScopeAnnotationBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable_scoped/CustomScopeAnnotationBean.java
rename to spring-context/src/test/java/example/scannable_scoped/CustomScopeAnnotationBean.java
diff --git a/org.springframework.context/src/test/java/example/scannable_scoped/MyScope.java b/spring-context/src/test/java/example/scannable_scoped/MyScope.java
similarity index 100%
rename from org.springframework.context/src/test/java/example/scannable_scoped/MyScope.java
rename to spring-context/src/test/java/example/scannable_scoped/MyScope.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
rename to spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java
rename to spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
rename to spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml b/spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/config/PrototypeProxyTests.java b/spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/config/PrototypeProxyTests.java
rename to spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
rename to spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
rename to spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
rename to spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
rename to spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/_TestTypes.java
rename to spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java
rename to spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
rename to spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
rename to spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
rename to spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
rename to spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-list.xml b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-list.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-list.xml
rename to spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-list.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-map.xml b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-map.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-map.xml
rename to spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-map.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-override.xml b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-override.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-override.xml
rename to spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-override.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-testbean.xml b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-testbean.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-testbean.xml
rename to spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-testbean.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
rename to spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests-context.xml b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests-context.xml
rename to spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
rename to spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/BeanWithObjectProperty.java b/spring-context/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
rename to spring-context/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/Colour.java b/spring-context/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/Colour.java
rename to spring-context/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/DerivedTestBean.java
rename to spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/FieldAccessBean.java b/spring-context/src/test/java/org/springframework/beans/FieldAccessBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/FieldAccessBean.java
rename to spring-context/src/test/java/org/springframework/beans/FieldAccessBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-context/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/IOther.java b/spring-context/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/IOther.java
rename to spring-context/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/ITestBean.java b/spring-context/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-context/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/Person.java b/spring-context/src/test/java/org/springframework/beans/Person.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/Person.java
rename to spring-context/src/test/java/org/springframework/beans/Person.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/ResourceTestBean.java b/spring-context/src/test/java/org/springframework/beans/ResourceTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/ResourceTestBean.java
rename to spring-context/src/test/java/org/springframework/beans/ResourceTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/SerializablePerson.java
rename to spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/TestBean.java b/spring-context/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/TestBean.java
rename to spring-context/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
rename to spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
rename to spring-context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/DummyFactory.java
rename to spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/HasMap.java b/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/HasMap.java
rename to spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
rename to spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
rename to spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
rename to spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/access/TestBean.java b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/access/TestBean.java
rename to spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/access/beans1.xml b/spring-context/src/test/java/org/springframework/beans/factory/access/beans1.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/access/beans1.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/access/beans1.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/access/beans2.xml b/spring-context/src/test/java/org/springframework/beans/factory/access/beans2.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/access/beans2.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/access/beans2.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/access/ref1.xml b/spring-context/src/test/java/org/springframework/beans/factory/access/ref1.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/access/ref1.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/access/ref1.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java
rename to spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
rename to spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
rename to spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java b/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java
rename to spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java b/spring-context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java
rename to spring-context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerWithExpressionLanguageTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerWithExpressionLanguageTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerWithExpressionLanguageTests.java
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerWithExpressionLanguageTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.properties b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.properties
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd
diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/test.properties b/spring-context/src/test/java/org/springframework/beans/factory/xml/test.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/beans/factory/xml/test.properties
rename to spring-context/src/test/java/org/springframework/beans/factory/xml/test.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/NoOpCacheManagerTests.java b/spring-context/src/test/java/org/springframework/cache/NoOpCacheManagerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/NoOpCacheManagerTests.java
rename to spring-context/src/test/java/org/springframework/cache/NoOpCacheManagerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTest.java b/spring-context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTest.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTest.java
rename to spring-context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTest.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/concurrent/ConcurrentCacheTests.java b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentCacheTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/concurrent/ConcurrentCacheTests.java
rename to spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentCacheTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java
rename to spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTests.java b/spring-context/src/test/java/org/springframework/cache/config/AbstractAnnotationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTests.java
rename to spring-context/src/test/java/org/springframework/cache/config/AbstractAnnotationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
rename to spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java
rename to spring-context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/config/AnnotationTests.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/config/AnnotationTests.java
rename to spring-context/src/test/java/org/springframework/cache/config/AnnotationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/config/CacheAdviceNamespaceTests.java b/spring-context/src/test/java/org/springframework/cache/config/CacheAdviceNamespaceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/config/CacheAdviceNamespaceTests.java
rename to spring-context/src/test/java/org/springframework/cache/config/CacheAdviceNamespaceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/config/CacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/config/CacheableService.java
rename to spring-context/src/test/java/org/springframework/cache/config/CacheableService.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
rename to spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/config/EnableCachingTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
rename to spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java b/spring-context/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
rename to spring-context/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java b/spring-context/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
rename to spring-context/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java b/spring-context/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
rename to spring-context/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/interceptor/ExpressionEvalutatorTest.java b/spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvalutatorTest.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/interceptor/ExpressionEvalutatorTest.java
rename to spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvalutatorTest.java
diff --git a/org.springframework.context/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTests.java b/spring-context/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTests.java
rename to spring-context/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/ACATester.java b/spring-context/src/test/java/org/springframework/context/ACATester.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/ACATester.java
rename to spring-context/src/test/java/org/springframework/context/ACATester.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
rename to spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/BeanThatBroadcasts.java
rename to spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/BeanThatListens.java b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/BeanThatListens.java
rename to spring-context/src/test/java/org/springframework/context/BeanThatListens.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/LifecycleContextBean.java
rename to spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/TestListener.java b/spring-context/src/test/java/org/springframework/context/TestListener.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/TestListener.java
rename to spring-context/src/test/java/org/springframework/context/TestListener.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
rename to spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml
rename to spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml
rename to spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
rename to spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml
rename to spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
rename to spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java b/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java
rename to spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/BeanAge.java b/spring-context/src/test/java/org/springframework/context/annotation/BeanAge.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/BeanAge.java
rename to spring-context/src/test/java/org/springframework/context/annotation/BeanAge.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java b/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationRecursionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationRecursionTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationRecursionTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationRecursionTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java b/spring-context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/EnableAspectJAutoProxyTests.java b/spring-context/src/test/java/org/springframework/context/annotation/EnableAspectJAutoProxyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/EnableAspectJAutoProxyTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/EnableAspectJAutoProxyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
rename to spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java b/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ReflectionUtilsIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ReflectionUtilsIntegrationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/ReflectionUtilsIntegrationTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/ReflectionUtilsIntegrationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/RoleAnnotationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/RoleAnnotationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/RoleAnnotationTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/RoleAnnotationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java b/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java
rename to spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java b/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java
rename to spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/cycle/left/LeftConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/cycle/left/LeftConfig.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/cycle/left/LeftConfig.java
rename to spring-context/src/test/java/org/springframework/context/annotation/componentscan/cycle/left/LeftConfig.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/cycle/right/RightConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/cycle/right/RightConfig.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/cycle/right/RightConfig.java
rename to spring-context/src/test/java/org/springframework/context/annotation/componentscan/cycle/right/RightConfig.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/level1/Level1Config.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/level1/Level1Config.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/level1/Level1Config.java
rename to spring-context/src/test/java/org/springframework/context/annotation/componentscan/level1/Level1Config.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/level2/Level2Config.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/level2/Level2Config.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/level2/Level2Config.java
rename to spring-context/src/test/java/org/springframework/context/annotation/componentscan/level2/Level2Config.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/level3/Level3Component.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/level3/Level3Component.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/level3/Level3Component.java
rename to spring-context/src/test/java/org/springframework/context/annotation/componentscan/level3/Level3Component.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java
rename to spring-context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.properties b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.properties
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassWithPlaceholderConfigurerBeanTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassWithPlaceholderConfigurerBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassWithPlaceholderConfigurerBeanTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassWithPlaceholderConfigurerBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportAnnotationDetectionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportAnnotationDetectionTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportAnnotationDetectionTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportAnnotationDetectionTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/PackagePrivateBeanMethodInheritanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/PackagePrivateBeanMethodInheritanceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/PackagePrivateBeanMethodInheritanceTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/PackagePrivateBeanMethodInheritanceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/a/BaseConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/a/BaseConfig.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/a/BaseConfig.java
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/a/BaseConfig.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/annotation-config.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/annotation-config.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/annotation-config.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/annotation-config.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/customNameGeneratorTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/customNameGeneratorTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/customNameGeneratorTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/customNameGeneratorTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/customScopeResolverTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/customScopeResolverTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/customScopeResolverTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/customScopeResolverTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/customTypeFilterTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/customTypeFilterTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/customTypeFilterTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/customTypeFilterTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/defaultAutowireByNameTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByNameTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/defaultAutowireByNameTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByNameTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/defaultAutowireByTypeTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByTypeTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/defaultAutowireByTypeTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByTypeTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/defaultAutowireConstructorTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireConstructorTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/defaultAutowireConstructorTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireConstructorTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/defaultAutowireNoTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireNoTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/defaultAutowireNoTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireNoTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/defaultLazyInitFalseTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitFalseTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/defaultLazyInitFalseTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitFalseTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/defaultLazyInitTrueTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitTrueTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/defaultLazyInitTrueTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitTrueTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/defaultWithNoOverridesTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultWithNoOverridesTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/defaultWithNoOverridesTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/defaultWithNoOverridesTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/jsr330/SpringAtInjectTck.java b/spring-context/src/test/java/org/springframework/context/annotation/jsr330/SpringAtInjectTck.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/jsr330/SpringAtInjectTck.java
rename to spring-context/src/test/java/org/springframework/context/annotation/jsr330/SpringAtInjectTck.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/matchingResourcePatternTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/matchingResourcePatternTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/matchingResourcePatternTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/matchingResourcePatternTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/p1.properties b/spring-context/src/test/java/org/springframework/context/annotation/p1.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/p1.properties
rename to spring-context/src/test/java/org/springframework/context/annotation/p1.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/p2.properties b/spring-context/src/test/java/org/springframework/context/annotation/p2.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/p2.properties
rename to spring-context/src/test/java/org/springframework/context/annotation/p2.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/role/ComponentWithRole.java b/spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithRole.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/role/ComponentWithRole.java
rename to spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithRole.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/role/ComponentWithoutRole.java b/spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithoutRole.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/role/ComponentWithoutRole.java
rename to spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithoutRole.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/scopedProxyDefaultTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyDefaultTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/scopedProxyDefaultTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/scopedProxyDefaultTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/scopedProxyInterfacesTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInterfacesTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/scopedProxyInterfacesTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInterfacesTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/scopedProxyNoTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyNoTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/scopedProxyNoTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/scopedProxyNoTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/scopedProxyTargetClassTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyTargetClassTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/scopedProxyTargetClassTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/scopedProxyTargetClassTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml
rename to spring-context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/spr8808/Spr8808Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/spr8808/Spr8808Tests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation/spr8808/Spr8808Tests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/spr8808/Spr8808Tests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation2/NamedStubDao2.java b/spring-context/src/test/java/org/springframework/context/annotation2/NamedStubDao2.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation2/NamedStubDao2.java
rename to spring-context/src/test/java/org/springframework/context/annotation2/NamedStubDao2.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation3/StubFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation3/StubFooDao.java
rename to spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation4/DependencyBean.java b/spring-context/src/test/java/org/springframework/context/annotation4/DependencyBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation4/DependencyBean.java
rename to spring-context/src/test/java/org/springframework/context/annotation4/DependencyBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java b/spring-context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java
rename to spring-context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation4/SimpleBean.java b/spring-context/src/test/java/org/springframework/context/annotation4/SimpleBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation4/SimpleBean.java
rename to spring-context/src/test/java/org/springframework/context/annotation4/SimpleBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation5/MyRepository.java b/spring-context/src/test/java/org/springframework/context/annotation5/MyRepository.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation5/MyRepository.java
rename to spring-context/src/test/java/org/springframework/context/annotation5/MyRepository.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
rename to spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation6/ComponentForScanning.java b/spring-context/src/test/java/org/springframework/context/annotation6/ComponentForScanning.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation6/ComponentForScanning.java
rename to spring-context/src/test/java/org/springframework/context/annotation6/ComponentForScanning.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation6/ConfigForScanning.java b/spring-context/src/test/java/org/springframework/context/annotation6/ConfigForScanning.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation6/ConfigForScanning.java
rename to spring-context/src/test/java/org/springframework/context/annotation6/ConfigForScanning.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation6/Jsr330NamedForScanning.java b/spring-context/src/test/java/org/springframework/context/annotation6/Jsr330NamedForScanning.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/annotation6/Jsr330NamedForScanning.java
rename to spring-context/src/test/java/org/springframework/context/annotation6/Jsr330NamedForScanning.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/config/ContextNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/context/config/ContextNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/config/ContextNamespaceHandlerTests.java
rename to spring-context/src/test/java/org/springframework/context/config/ContextNamespaceHandlerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/conversionservice/Bar.java b/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/conversionservice/Bar.java
rename to spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java b/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java
rename to spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java b/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java
rename to spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/conversionservice/TestClient.java b/spring-context/src/test/java/org/springframework/context/conversionservice/TestClient.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/conversionservice/TestClient.java
rename to spring-context/src/test/java/org/springframework/context/conversionservice/TestClient.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
rename to spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
rename to spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/event/LifecycleEventTests.java b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
rename to spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
rename to spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java
rename to spring-context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/ApplicationContextLifecycleTests.java b/spring-context/src/test/java/org/springframework/context/support/ApplicationContextLifecycleTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/ApplicationContextLifecycleTests.java
rename to spring-context/src/test/java/org/springframework/context/support/ApplicationContextLifecycleTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/Assembler.java b/spring-context/src/test/java/org/springframework/context/support/Assembler.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/Assembler.java
rename to spring-context/src/test/java/org/springframework/context/support/Assembler.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/AutowiredService.java b/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/AutowiredService.java
rename to spring-context/src/test/java/org/springframework/context/support/AutowiredService.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
rename to spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
rename to spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml
rename to spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
rename to spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
rename to spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
rename to spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java b/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java
rename to spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
rename to spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml b/spring-context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml
rename to spring-context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests.java
rename to spring-context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/LifecycleTestBean.java b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
rename to spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/Logic.java b/spring-context/src/test/java/org/springframework/context/support/Logic.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/Logic.java
rename to spring-context/src/test/java/org/springframework/context/support/Logic.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/NoOpAdvice.java b/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/NoOpAdvice.java
rename to spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
rename to spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
rename to spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.properties b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.properties
rename to spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java
rename to spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/ResourceConverter.java b/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/ResourceConverter.java
rename to spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/SerializableBeanFactoryMemoryLeakTests.java b/spring-context/src/test/java/org/springframework/context/support/SerializableBeanFactoryMemoryLeakTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/SerializableBeanFactoryMemoryLeakTests.java
rename to spring-context/src/test/java/org/springframework/context/support/SerializableBeanFactoryMemoryLeakTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/Service.java b/spring-context/src/test/java/org/springframework/context/support/Service.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/Service.java
rename to spring-context/src/test/java/org/springframework/context/support/Service.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
rename to spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/Spr7283Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/Spr7283Tests.java
rename to spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/Spr7816Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/Spr7816Tests.java
rename to spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
rename to spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
rename to spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
rename to spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/TestIF.java b/spring-context/src/test/java/org/springframework/context/support/TestIF.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/TestIF.java
rename to spring-context/src/test/java/org/springframework/context/support/TestIF.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java b/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java
rename to spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/aliasForParent.xml b/spring-context/src/test/java/org/springframework/context/support/aliasForParent.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/aliasForParent.xml
rename to spring-context/src/test/java/org/springframework/context/support/aliasForParent.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml b/spring-context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml
rename to spring-context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/childWithProxy.xml b/spring-context/src/test/java/org/springframework/context/support/childWithProxy.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/childWithProxy.xml
rename to spring-context/src/test/java/org/springframework/context/support/childWithProxy.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml b/spring-context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml
rename to spring-context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/conversionService.xml b/spring-context/src/test/java/org/springframework/context/support/conversionService.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/conversionService.xml
rename to spring-context/src/test/java/org/springframework/context/support/conversionService.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml b/spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml
rename to spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/invalidClass.xml b/spring-context/src/test/java/org/springframework/context/support/invalidClass.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/invalidClass.xml
rename to spring-context/src/test/java/org/springframework/context/support/invalidClass.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/invalidValueType.xml b/spring-context/src/test/java/org/springframework/context/support/invalidValueType.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/invalidValueType.xml
rename to spring-context/src/test/java/org/springframework/context/support/invalidValueType.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/lifecycleTests.xml b/spring-context/src/test/java/org/springframework/context/support/lifecycleTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/lifecycleTests.xml
rename to spring-context/src/test/java/org/springframework/context/support/lifecycleTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/messages.properties b/spring-context/src/test/java/org/springframework/context/support/messages.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/messages.properties
rename to spring-context/src/test/java/org/springframework/context/support/messages.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/messages_de.properties b/spring-context/src/test/java/org/springframework/context/support/messages_de.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/messages_de.properties
rename to spring-context/src/test/java/org/springframework/context/support/messages_de.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/messages_de_AT.properties b/spring-context/src/test/java/org/springframework/context/support/messages_de_AT.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/messages_de_AT.properties
rename to spring-context/src/test/java/org/springframework/context/support/messages_de_AT.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/messages_de_AT_oo.properties b/spring-context/src/test/java/org/springframework/context/support/messages_de_AT_oo.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/messages_de_AT_oo.properties
rename to spring-context/src/test/java/org/springframework/context/support/messages_de_AT_oo.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/messages_de_DE.xml b/spring-context/src/test/java/org/springframework/context/support/messages_de_DE.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/messages_de_DE.xml
rename to spring-context/src/test/java/org/springframework/context/support/messages_de_DE.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/more-messages.properties b/spring-context/src/test/java/org/springframework/context/support/more-messages.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/more-messages.properties
rename to spring-context/src/test/java/org/springframework/context/support/more-messages.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/override.properties b/spring-context/src/test/java/org/springframework/context/support/override.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/override.properties
rename to spring-context/src/test/java/org/springframework/context/support/override.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/placeholder.properties b/spring-context/src/test/java/org/springframework/context/support/placeholder.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/placeholder.properties
rename to spring-context/src/test/java/org/springframework/context/support/placeholder.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/simpleContext.xml b/spring-context/src/test/java/org/springframework/context/support/simpleContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/simpleContext.xml
rename to spring-context/src/test/java/org/springframework/context/support/simpleContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/spr7283.xml b/spring-context/src/test/java/org/springframework/context/support/spr7283.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/spr7283.xml
rename to spring-context/src/test/java/org/springframework/context/support/spr7283.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/spr7816.xml b/spring-context/src/test/java/org/springframework/context/support/spr7816.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/spr7816.xml
rename to spring-context/src/test/java/org/springframework/context/support/spr7816.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/test.properties b/spring-context/src/test/java/org/springframework/context/support/test.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/test.properties
rename to spring-context/src/test/java/org/springframework/context/support/test.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml b/spring-context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml
rename to spring-context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/test/contextA.xml b/spring-context/src/test/java/org/springframework/context/support/test/contextA.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/test/contextA.xml
rename to spring-context/src/test/java/org/springframework/context/support/test/contextA.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/test/contextB.xml b/spring-context/src/test/java/org/springframework/context/support/test/contextB.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/test/contextB.xml
rename to spring-context/src/test/java/org/springframework/context/support/test/contextB.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/test/contextC.xml b/spring-context/src/test/java/org/springframework/context/support/test/contextC.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/test/contextC.xml
rename to spring-context/src/test/java/org/springframework/context/support/test/contextC.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/test/import1.xml b/spring-context/src/test/java/org/springframework/context/support/test/import1.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/test/import1.xml
rename to spring-context/src/test/java/org/springframework/context/support/test/import1.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/test/subtest/import2.xml b/spring-context/src/test/java/org/springframework/context/support/test/subtest/import2.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/test/subtest/import2.xml
rename to spring-context/src/test/java/org/springframework/context/support/test/subtest/import2.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/testBeans.properties b/spring-context/src/test/java/org/springframework/context/support/testBeans.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/context/support/testBeans.properties
rename to spring-context/src/test/java/org/springframework/context/support/testBeans.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/core/task/NoOpRunnable.java b/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/core/task/NoOpRunnable.java
rename to spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java
diff --git a/org.springframework.context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
rename to spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
rename to spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
rename to spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
rename to spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java
rename to spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java
rename to spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml b/spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
rename to spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/ejb/support/EjbSupportTests.java b/spring-context/src/test/java/org/springframework/ejb/support/EjbSupportTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/ejb/support/EjbSupportTests.java
rename to spring-context/src/test/java/org/springframework/ejb/support/EjbSupportTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java b/spring-context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java
rename to spring-context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java b/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
rename to spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java b/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java
rename to spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/format/number/NumberFormatterTests.java b/spring-context/src/test/java/org/springframework/format/number/NumberFormatterTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/format/number/NumberFormatterTests.java
rename to spring-context/src/test/java/org/springframework/format/number/NumberFormatterTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/format/number/NumberFormattingTests.java b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
rename to spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/format/number/PercentFormatterTests.java b/spring-context/src/test/java/org/springframework/format/number/PercentFormatterTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/format/number/PercentFormatterTests.java
rename to spring-context/src/test/java/org/springframework/format/number/PercentFormatterTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
rename to spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
rename to spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java
rename to spring-context/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
rename to spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
rename to spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
rename to spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java
rename to spring-context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaverTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaverTests.java
rename to spring-context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaverTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/instrument/classloading/testResource.xml b/spring-context/src/test/java/org/springframework/instrument/classloading/testResource.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/instrument/classloading/testResource.xml
rename to spring-context/src/test/java/org/springframework/instrument/classloading/testResource.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/AbstractJmxTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/AbstractJmxTests.java
rename to spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
rename to spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/IJmxTestBean.java b/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/IJmxTestBean.java
rename to spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/JmxTestBean.java b/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/JmxTestBean.java
rename to spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
rename to spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java
rename to spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/applicationContext.xml b/spring-context/src/test/java/org/springframework/jmx/applicationContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/applicationContext.xml
rename to spring-context/src/test/java/org/springframework/jmx/applicationContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/DateRange.java b/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/DateRange.java
rename to spring-context/src/test/java/org/springframework/jmx/export/DateRange.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java b/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java
rename to spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/LazyInitMBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/export/LazyInitMBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/LazyInitMBeanTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/LazyInitMBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java b/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java
rename to spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationLazyInitMBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationLazyInitMBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationLazyInitMBeanTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationLazyInitMBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/FactoryCreatedAnnotationTestBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/FactoryCreatedAnnotationTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/FactoryCreatedAnnotationTestBean.java
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/FactoryCreatedAnnotationTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/IAnnotationTestBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/IAnnotationTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/IAnnotationTestBean.java
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/IAnnotationTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml b/spring-context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml b/spring-context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml b/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml b/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractAutodetectTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractAutodetectTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractAutodetectTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractAutodetectTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ICustomBase.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomBase.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ICustomBase.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomBase.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml b/spring-context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml b/spring-context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml b/spring-context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/customConfigurer.xml b/spring-context/src/test/java/org/springframework/jmx/export/customConfigurer.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/customConfigurer.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/customConfigurer.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/excludedBeans.xml b/spring-context/src/test/java/org/springframework/jmx/export/excludedBeans.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/excludedBeans.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/excludedBeans.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/lazyInit.xml b/spring-context/src/test/java/org/springframework/jmx/export/lazyInit.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/lazyInit.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/lazyInit.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/AbstractNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/AbstractNamingStrategyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/naming/AbstractNamingStrategyTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/naming/AbstractNamingStrategyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/IdentityNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/IdentityNamingStrategyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/naming/IdentityNamingStrategyTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/naming/IdentityNamingStrategyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/jmx-names.properties b/spring-context/src/test/java/org/springframework/jmx/export/naming/jmx-names.properties
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/naming/jmx-names.properties
rename to spring-context/src/test/java/org/springframework/jmx/export/naming/jmx-names.properties
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java
rename to spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml b/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml b/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml b/spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
rename to spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTestsIgnore.java b/spring-context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTestsIgnore.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTestsIgnore.java
rename to spring-context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTestsIgnore.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
rename to spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
rename to spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java
rename to spring-context/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
rename to spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java
rename to spring-context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java
rename to spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jndi/JndiTemplateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
rename to spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java
rename to spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/mock/env/MockEnvironment.java b/spring-context/src/test/java/org/springframework/mock/env/MockEnvironment.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/mock/env/MockEnvironment.java
rename to spring-context/src/test/java/org/springframework/mock/env/MockEnvironment.java
diff --git a/org.springframework.context/src/test/java/org/springframework/mock/env/MockPropertySource.java b/spring-context/src/test/java/org/springframework/mock/env/MockPropertySource.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/mock/env/MockPropertySource.java
rename to spring-context/src/test/java/org/springframework/mock/env/MockPropertySource.java
diff --git a/org.springframework.context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
rename to spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
diff --git a/org.springframework.context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
rename to spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
diff --git a/org.springframework.context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
rename to spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
diff --git a/org.springframework.context/src/test/java/org/springframework/mock/jndi/package-info.java b/spring-context/src/test/java/org/springframework/mock/jndi/package-info.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/mock/jndi/package-info.java
rename to spring-context/src/test/java/org/springframework/mock/jndi/package-info.java
diff --git a/org.springframework.context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
rename to spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java b/spring-context/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java
rename to spring-context/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java b/spring-context/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
rename to spring-context/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml b/spring-context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml
rename to spring-context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutorTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParserTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParserTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParserTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/config/LazyScheduledTasksBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/LazyScheduledTasksBeanDefinitionParserTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/config/LazyScheduledTasksBeanDefinitionParserTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/config/LazyScheduledTasksBeanDefinitionParserTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParserTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParserTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParserTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
rename to spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/Calculator.java b/spring-context/src/test/java/org/springframework/scripting/Calculator.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/Calculator.java
rename to spring-context/src/test/java/org/springframework/scripting/Calculator.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/CallCounter.java b/spring-context/src/test/java/org/springframework/scripting/CallCounter.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/CallCounter.java
rename to spring-context/src/test/java/org/springframework/scripting/CallCounter.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/ConfigurableMessenger.java b/spring-context/src/test/java/org/springframework/scripting/ConfigurableMessenger.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/ConfigurableMessenger.java
rename to spring-context/src/test/java/org/springframework/scripting/ConfigurableMessenger.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/ContextScriptBean.java b/spring-context/src/test/java/org/springframework/scripting/ContextScriptBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/ContextScriptBean.java
rename to spring-context/src/test/java/org/springframework/scripting/ContextScriptBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/Messenger.java b/spring-context/src/test/java/org/springframework/scripting/Messenger.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/Messenger.java
rename to spring-context/src/test/java/org/springframework/scripting/Messenger.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/MessengerScrambler.java b/spring-context/src/test/java/org/springframework/scripting/MessengerScrambler.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/MessengerScrambler.java
rename to spring-context/src/test/java/org/springframework/scripting/MessengerScrambler.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/ScriptBean.java b/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/ScriptBean.java
rename to spring-context/src/test/java/org/springframework/scripting/ScriptBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java b/spring-context/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java
rename to spring-context/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/bsh/Broken.bsh b/spring-context/src/test/java/org/springframework/scripting/bsh/Broken.bsh
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/bsh/Broken.bsh
rename to spring-context/src/test/java/org/springframework/scripting/bsh/Broken.bsh
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
rename to spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/bsh/Calculator.bsh b/spring-context/src/test/java/org/springframework/scripting/bsh/Calculator.bsh
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/bsh/Calculator.bsh
rename to spring-context/src/test/java/org/springframework/scripting/bsh/Calculator.bsh
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/bsh/Messenger.bsh b/spring-context/src/test/java/org/springframework/scripting/bsh/Messenger.bsh
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/bsh/Messenger.bsh
rename to spring-context/src/test/java/org/springframework/scripting/bsh/Messenger.bsh
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh b/spring-context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh
rename to spring-context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/bsh/MessengerInstance.bsh b/spring-context/src/test/java/org/springframework/scripting/bsh/MessengerInstance.bsh
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/bsh/MessengerInstance.bsh
rename to spring-context/src/test/java/org/springframework/scripting/bsh/MessengerInstance.bsh
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml b/spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
rename to spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml b/spring-context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml
rename to spring-context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshContext.xml b/spring-context/src/test/java/org/springframework/scripting/bsh/bshContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshContext.xml
rename to spring-context/src/test/java/org/springframework/scripting/bsh/bshContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml b/spring-context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml
rename to spring-context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/config/ITestBean.java b/spring-context/src/test/java/org/springframework/scripting/config/ITestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/config/ITestBean.java
rename to spring-context/src/test/java/org/springframework/scripting/config/ITestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/config/OtherTestBean.java b/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/config/OtherTestBean.java
rename to spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java b/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
rename to spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/Broken.groovyb b/spring-context/src/test/java/org/springframework/scripting/groovy/Broken.groovyb
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/Broken.groovyb
rename to spring-context/src/test/java/org/springframework/scripting/groovy/Broken.groovyb
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/Calculator.groovy b/spring-context/src/test/java/org/springframework/scripting/groovy/Calculator.groovy
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/Calculator.groovy
rename to spring-context/src/test/java/org/springframework/scripting/groovy/Calculator.groovy
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/CallCounter.groovy b/spring-context/src/test/java/org/springframework/scripting/groovy/CallCounter.groovy
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/CallCounter.groovy
rename to spring-context/src/test/java/org/springframework/scripting/groovy/CallCounter.groovy
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java b/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java
rename to spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/DelegatingCalculator.groovy b/spring-context/src/test/java/org/springframework/scripting/groovy/DelegatingCalculator.groovy
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/DelegatingCalculator.groovy
rename to spring-context/src/test/java/org/springframework/scripting/groovy/DelegatingCalculator.groovy
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests.java
rename to spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java
rename to spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
rename to spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
rename to spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyServiceImpl.grv b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyServiceImpl.grv
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyServiceImpl.grv
rename to spring-context/src/test/java/org/springframework/scripting/groovy/GroovyServiceImpl.grv
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/Log.java b/spring-context/src/test/java/org/springframework/scripting/groovy/Log.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/Log.java
rename to spring-context/src/test/java/org/springframework/scripting/groovy/Log.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
rename to spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy b/spring-context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy
rename to spring-context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/MessengerInstance.groovy b/spring-context/src/test/java/org/springframework/scripting/groovy/MessengerInstance.groovy
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/MessengerInstance.groovy
rename to spring-context/src/test/java/org/springframework/scripting/groovy/MessengerInstance.groovy
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy b/spring-context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy
rename to spring-context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestException.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestException.java
rename to spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestFactoryBean.groovy b/spring-context/src/test/java/org/springframework/scripting/groovy/TestFactoryBean.groovy
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestFactoryBean.groovy
rename to spring-context/src/test/java/org/springframework/scripting/groovy/TestFactoryBean.groovy
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestService.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestService.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestService.java
rename to spring-context/src/test/java/org/springframework/scripting/groovy/TestService.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java
rename to spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/calculators.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/calculators.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/calculators.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/calculators.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
rename to spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml
rename to spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml
rename to spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java
rename to spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Broken.rb b/spring-context/src/test/java/org/springframework/scripting/jruby/Broken.rb
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/Broken.rb
rename to spring-context/src/test/java/org/springframework/scripting/jruby/Broken.rb
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Calculator.rb b/spring-context/src/test/java/org/springframework/scripting/jruby/Calculator.rb
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/Calculator.rb
rename to spring-context/src/test/java/org/springframework/scripting/jruby/Calculator.rb
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
rename to spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Messenger.rb b/spring-context/src/test/java/org/springframework/scripting/jruby/Messenger.rb
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/Messenger.rb
rename to spring-context/src/test/java/org/springframework/scripting/jruby/Messenger.rb
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java b/spring-context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
rename to spring-context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printable.java b/spring-context/src/test/java/org/springframework/scripting/jruby/Printable.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printable.java
rename to spring-context/src/test/java/org/springframework/scripting/jruby/Printable.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printer.java b/spring-context/src/test/java/org/springframework/scripting/jruby/Printer.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printer.java
rename to spring-context/src/test/java/org/springframework/scripting/jruby/Printer.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printer.rb b/spring-context/src/test/java/org/springframework/scripting/jruby/Printer.rb
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printer.rb
rename to spring-context/src/test/java/org/springframework/scripting/jruby/Printer.rb
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
rename to spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml
rename to spring-context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
rename to spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml
rename to spring-context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml
rename to spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml
rename to spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml
rename to spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml
rename to spring-context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
rename to spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
rename to spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
rename to spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/support/StaticScriptSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/StaticScriptSourceTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/support/StaticScriptSourceTests.java
rename to spring-context/src/test/java/org/springframework/scripting/support/StaticScriptSourceTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/support/StubMessenger.java b/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/support/StubMessenger.java
rename to spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/support/groovyReferences.xml b/spring-context/src/test/java/org/springframework/scripting/support/groovyReferences.xml
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/support/groovyReferences.xml
rename to spring-context/src/test/java/org/springframework/scripting/support/groovyReferences.xml
diff --git a/org.springframework.context/src/test/java/org/springframework/ui/ModelMapTests.java b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/ui/ModelMapTests.java
rename to spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/util/SerializationTestUtils.java
rename to spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java
diff --git a/org.springframework.context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
rename to spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/validation/DataBinderTests.java
rename to spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/validation/ValidationUtilsTests.java b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
rename to spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java
rename to spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
rename to spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
diff --git a/org.springframework.context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
rename to spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
diff --git a/org.springframework.context/src/test/java/test/advice/CountingAfterReturningAdvice.java b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/advice/CountingAfterReturningAdvice.java
rename to spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
diff --git a/org.springframework.context/src/test/java/test/advice/CountingBeforeAdvice.java b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/advice/CountingBeforeAdvice.java
rename to spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
diff --git a/org.springframework.context/src/test/java/test/advice/MethodCounter.java b/spring-context/src/test/java/test/advice/MethodCounter.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/advice/MethodCounter.java
rename to spring-context/src/test/java/test/advice/MethodCounter.java
diff --git a/org.springframework.context/src/test/java/test/advice/MyThrowsHandler.java b/spring-context/src/test/java/test/advice/MyThrowsHandler.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/advice/MyThrowsHandler.java
rename to spring-context/src/test/java/test/advice/MyThrowsHandler.java
diff --git a/org.springframework.context/src/test/java/test/advice/TimestampIntroductionAdvisor.java b/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
rename to spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
diff --git a/org.springframework.context/src/test/java/test/aspect/PerTargetAspect.java b/spring-context/src/test/java/test/aspect/PerTargetAspect.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/aspect/PerTargetAspect.java
rename to spring-context/src/test/java/test/aspect/PerTargetAspect.java
diff --git a/org.springframework.context/src/test/java/test/aspect/PerThisAspect.java b/spring-context/src/test/java/test/aspect/PerThisAspect.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/aspect/PerThisAspect.java
rename to spring-context/src/test/java/test/aspect/PerThisAspect.java
diff --git a/org.springframework.context/src/test/java/test/aspect/TwoAdviceAspect.java b/spring-context/src/test/java/test/aspect/TwoAdviceAspect.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/aspect/TwoAdviceAspect.java
rename to spring-context/src/test/java/test/aspect/TwoAdviceAspect.java
diff --git a/org.springframework.context/src/test/java/test/beans/Colour.java b/spring-context/src/test/java/test/beans/Colour.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/Colour.java
rename to spring-context/src/test/java/test/beans/Colour.java
diff --git a/org.springframework.context/src/test/java/test/beans/CustomScope.java b/spring-context/src/test/java/test/beans/CustomScope.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/CustomScope.java
rename to spring-context/src/test/java/test/beans/CustomScope.java
diff --git a/org.springframework.context/src/test/java/test/beans/DependsOnTestBean.java b/spring-context/src/test/java/test/beans/DependsOnTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/DependsOnTestBean.java
rename to spring-context/src/test/java/test/beans/DependsOnTestBean.java
diff --git a/org.springframework.context/src/test/java/test/beans/Employee.java b/spring-context/src/test/java/test/beans/Employee.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/Employee.java
rename to spring-context/src/test/java/test/beans/Employee.java
diff --git a/org.springframework.context/src/test/java/test/beans/FactoryMethods.java b/spring-context/src/test/java/test/beans/FactoryMethods.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/FactoryMethods.java
rename to spring-context/src/test/java/test/beans/FactoryMethods.java
diff --git a/org.springframework.context/src/test/java/test/beans/INestedTestBean.java b/spring-context/src/test/java/test/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/INestedTestBean.java
rename to spring-context/src/test/java/test/beans/INestedTestBean.java
diff --git a/org.springframework.context/src/test/java/test/beans/IOther.java b/spring-context/src/test/java/test/beans/IOther.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/IOther.java
rename to spring-context/src/test/java/test/beans/IOther.java
diff --git a/org.springframework.context/src/test/java/test/beans/ITestBean.java b/spring-context/src/test/java/test/beans/ITestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/ITestBean.java
rename to spring-context/src/test/java/test/beans/ITestBean.java
diff --git a/org.springframework.context/src/test/java/test/beans/IndexedTestBean.java b/spring-context/src/test/java/test/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/IndexedTestBean.java
rename to spring-context/src/test/java/test/beans/IndexedTestBean.java
diff --git a/org.springframework.context/src/test/java/test/beans/NestedTestBean.java b/spring-context/src/test/java/test/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/NestedTestBean.java
rename to spring-context/src/test/java/test/beans/NestedTestBean.java
diff --git a/org.springframework.context/src/test/java/test/beans/SideEffectBean.java b/spring-context/src/test/java/test/beans/SideEffectBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/SideEffectBean.java
rename to spring-context/src/test/java/test/beans/SideEffectBean.java
diff --git a/org.springframework.context/src/test/java/test/beans/TestBean.java b/spring-context/src/test/java/test/beans/TestBean.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/beans/TestBean.java
rename to spring-context/src/test/java/test/beans/TestBean.java
diff --git a/org.springframework.context/src/test/java/test/interceptor/NopInterceptor.java b/spring-context/src/test/java/test/interceptor/NopInterceptor.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/interceptor/NopInterceptor.java
rename to spring-context/src/test/java/test/interceptor/NopInterceptor.java
diff --git a/org.springframework.context/src/test/java/test/interceptor/SerializableNopInterceptor.java b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/interceptor/SerializableNopInterceptor.java
rename to spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
diff --git a/org.springframework.context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
rename to spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
diff --git a/org.springframework.context/src/test/java/test/mixin/DefaultLockable.java b/spring-context/src/test/java/test/mixin/DefaultLockable.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/mixin/DefaultLockable.java
rename to spring-context/src/test/java/test/mixin/DefaultLockable.java
diff --git a/org.springframework.context/src/test/java/test/mixin/LockMixin.java b/spring-context/src/test/java/test/mixin/LockMixin.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/mixin/LockMixin.java
rename to spring-context/src/test/java/test/mixin/LockMixin.java
diff --git a/org.springframework.context/src/test/java/test/mixin/LockMixinAdvisor.java b/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/mixin/LockMixinAdvisor.java
rename to spring-context/src/test/java/test/mixin/LockMixinAdvisor.java
diff --git a/org.springframework.context/src/test/java/test/mixin/Lockable.java b/spring-context/src/test/java/test/mixin/Lockable.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/mixin/Lockable.java
rename to spring-context/src/test/java/test/mixin/Lockable.java
diff --git a/org.springframework.context/src/test/java/test/mixin/LockedException.java b/spring-context/src/test/java/test/mixin/LockedException.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/mixin/LockedException.java
rename to spring-context/src/test/java/test/mixin/LockedException.java
diff --git a/org.springframework.context/src/test/java/test/util/TimeStamped.java b/spring-context/src/test/java/test/util/TimeStamped.java
similarity index 100%
rename from org.springframework.context/src/test/java/test/util/TimeStamped.java
rename to spring-context/src/test/java/test/util/TimeStamped.java
diff --git a/org.springframework.context/src/test/resources/log4j.xml b/spring-context/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/log4j.xml
rename to spring-context/src/test/resources/log4j.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml
rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
rename to spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
rename to spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/cache/config/cache-advice.xml b/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/cache/config/cache-advice.xml
rename to spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml b/spring-context/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml
rename to spring-context/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml
rename to spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-override.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-override.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-override.xml
rename to spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-override.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace-ignore.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace-ignore.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace-ignore.xml
rename to spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace-ignore.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace.xml
rename to spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-simple.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-simple.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-simple.xml
rename to spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-simple.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-system.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-system.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-system.xml
rename to spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-system.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/config/empty-foo.properties b/spring-context/src/test/resources/org/springframework/context/config/empty-foo.properties
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/context/config/empty-foo.properties
rename to spring-context/src/test/resources/org/springframework/context/config/empty-foo.properties
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/config/test-bar.properties b/spring-context/src/test/resources/org/springframework/context/config/test-bar.properties
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/context/config/test-bar.properties
rename to spring-context/src/test/resources/org/springframework/context/config/test-bar.properties
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/config/test-foo.properties b/spring-context/src/test/resources/org/springframework/context/config/test-foo.properties
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/context/config/test-foo.properties
rename to spring-context/src/test/resources/org/springframework/context/config/test-foo.properties
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml b/spring-context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml
rename to spring-context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml b/spring-context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml
rename to spring-context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/scheduling/config/annotationDrivenContext.xml b/spring-context/src/test/resources/org/springframework/scheduling/config/annotationDrivenContext.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/scheduling/config/annotationDrivenContext.xml
rename to spring-context/src/test/resources/org/springframework/scheduling/config/annotationDrivenContext.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/scheduling/config/executorContext.xml b/spring-context/src/test/resources/org/springframework/scheduling/config/executorContext.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/scheduling/config/executorContext.xml
rename to spring-context/src/test/resources/org/springframework/scheduling/config/executorContext.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/scheduling/config/lazyScheduledTasksContext.xml b/spring-context/src/test/resources/org/springframework/scheduling/config/lazyScheduledTasksContext.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/scheduling/config/lazyScheduledTasksContext.xml
rename to spring-context/src/test/resources/org/springframework/scheduling/config/lazyScheduledTasksContext.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml b/spring-context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml
rename to spring-context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml b/spring-context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml
rename to spring-context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/scripting/config/TestBean.groovy b/spring-context/src/test/resources/org/springframework/scripting/config/TestBean.groovy
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/scripting/config/TestBean.groovy
rename to spring-context/src/test/resources/org/springframework/scripting/config/TestBean.groovy
diff --git a/org.springframework.context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsProxyTargetClassTests.xml b/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsProxyTargetClassTests.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsProxyTargetClassTests.xml
rename to spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsProxyTargetClassTests.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml b/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
rename to spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
diff --git a/org.springframework.context/src/test/resources/org/springframework/validation/messages1.properties b/spring-context/src/test/resources/org/springframework/validation/messages1.properties
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/validation/messages1.properties
rename to spring-context/src/test/resources/org/springframework/validation/messages1.properties
diff --git a/org.springframework.context/src/test/resources/org/springframework/validation/messages2.properties b/spring-context/src/test/resources/org/springframework/validation/messages2.properties
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/validation/messages2.properties
rename to spring-context/src/test/resources/org/springframework/validation/messages2.properties
diff --git a/org.springframework.context/src/test/resources/org/springframework/validation/messages3.properties b/spring-context/src/test/resources/org/springframework/validation/messages3.properties
similarity index 100%
rename from org.springframework.context/src/test/resources/org/springframework/validation/messages3.properties
rename to spring-context/src/test/resources/org/springframework/validation/messages3.properties
diff --git a/org.springframework.context/template.mf b/spring-context/template.mf
similarity index 100%
rename from org.springframework.context/template.mf
rename to spring-context/template.mf
diff --git a/org.springframework.core/src/main/java/org/springframework/core/AliasRegistry.java b/spring-core/src/main/java/org/springframework/core/AliasRegistry.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/AliasRegistry.java
rename to spring-core/src/main/java/org/springframework/core/AliasRegistry.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/AttributeAccessor.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/AttributeAccessor.java
rename to spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/AttributeAccessorSupport.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
rename to spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/BridgeMethodResolver.java b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/BridgeMethodResolver.java
rename to spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/CollectionFactory.java b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/CollectionFactory.java
rename to spring-core/src/main/java/org/springframework/core/CollectionFactory.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/ConcurrentMap.java b/spring-core/src/main/java/org/springframework/core/ConcurrentMap.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/ConcurrentMap.java
rename to spring-core/src/main/java/org/springframework/core/ConcurrentMap.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java b/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
rename to spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/ConstantException.java b/spring-core/src/main/java/org/springframework/core/ConstantException.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/ConstantException.java
rename to spring-core/src/main/java/org/springframework/core/ConstantException.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/Constants.java b/spring-core/src/main/java/org/springframework/core/Constants.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/Constants.java
rename to spring-core/src/main/java/org/springframework/core/Constants.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/ControlFlow.java b/spring-core/src/main/java/org/springframework/core/ControlFlow.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/ControlFlow.java
rename to spring-core/src/main/java/org/springframework/core/ControlFlow.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/ControlFlowFactory.java b/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/ControlFlowFactory.java
rename to spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/Conventions.java b/spring-core/src/main/java/org/springframework/core/Conventions.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/Conventions.java
rename to spring-core/src/main/java/org/springframework/core/Conventions.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/DecoratingClassLoader.java b/spring-core/src/main/java/org/springframework/core/DecoratingClassLoader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/DecoratingClassLoader.java
rename to spring-core/src/main/java/org/springframework/core/DecoratingClassLoader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/ErrorCoded.java b/spring-core/src/main/java/org/springframework/core/ErrorCoded.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/ErrorCoded.java
rename to spring-core/src/main/java/org/springframework/core/ErrorCoded.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/ExceptionDepthComparator.java b/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/ExceptionDepthComparator.java
rename to spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java
rename to spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/GenericTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/GenericTypeResolver.java
rename to spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/InfrastructureProxy.java b/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/InfrastructureProxy.java
rename to spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/JdkVersion.java b/spring-core/src/main/java/org/springframework/core/JdkVersion.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/JdkVersion.java
rename to spring-core/src/main/java/org/springframework/core/JdkVersion.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
rename to spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/MethodParameter.java b/spring-core/src/main/java/org/springframework/core/MethodParameter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/MethodParameter.java
rename to spring-core/src/main/java/org/springframework/core/MethodParameter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/NamedInheritableThreadLocal.java b/spring-core/src/main/java/org/springframework/core/NamedInheritableThreadLocal.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/NamedInheritableThreadLocal.java
rename to spring-core/src/main/java/org/springframework/core/NamedInheritableThreadLocal.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/NamedThreadLocal.java b/spring-core/src/main/java/org/springframework/core/NamedThreadLocal.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/NamedThreadLocal.java
rename to spring-core/src/main/java/org/springframework/core/NamedThreadLocal.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/NestedCheckedException.java b/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/NestedCheckedException.java
rename to spring-core/src/main/java/org/springframework/core/NestedCheckedException.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/NestedExceptionUtils.java b/spring-core/src/main/java/org/springframework/core/NestedExceptionUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/NestedExceptionUtils.java
rename to spring-core/src/main/java/org/springframework/core/NestedExceptionUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/NestedIOException.java b/spring-core/src/main/java/org/springframework/core/NestedIOException.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/NestedIOException.java
rename to spring-core/src/main/java/org/springframework/core/NestedIOException.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/NestedRuntimeException.java b/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/NestedRuntimeException.java
rename to spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/OrderComparator.java b/spring-core/src/main/java/org/springframework/core/OrderComparator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/OrderComparator.java
rename to spring-core/src/main/java/org/springframework/core/OrderComparator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/Ordered.java b/spring-core/src/main/java/org/springframework/core/Ordered.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/Ordered.java
rename to spring-core/src/main/java/org/springframework/core/Ordered.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/OverridingClassLoader.java b/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/OverridingClassLoader.java
rename to spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java
rename to spring-core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
rename to spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/PriorityOrdered.java b/spring-core/src/main/java/org/springframework/core/PriorityOrdered.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/PriorityOrdered.java
rename to spring-core/src/main/java/org/springframework/core/PriorityOrdered.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/SimpleAliasRegistry.java b/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
rename to spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/SmartClassLoader.java b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/SmartClassLoader.java
rename to spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/SpringVersion.java b/spring-core/src/main/java/org/springframework/core/SpringVersion.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/SpringVersion.java
rename to spring-core/src/main/java/org/springframework/core/SpringVersion.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java
rename to spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
rename to spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/annotation/Order.java b/spring-core/src/main/java/org/springframework/core/annotation/Order.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/annotation/Order.java
rename to spring-core/src/main/java/org/springframework/core/annotation/Order.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/annotation/package-info.java b/spring-core/src/main/java/org/springframework/core/annotation/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/annotation/package-info.java
rename to spring-core/src/main/java/org/springframework/core/annotation/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/AbstractDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/AbstractDescriptor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/AbstractDescriptor.java
rename to spring-core/src/main/java/org/springframework/core/convert/AbstractDescriptor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/BeanPropertyDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/BeanPropertyDescriptor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/BeanPropertyDescriptor.java
rename to spring-core/src/main/java/org/springframework/core/convert/BeanPropertyDescriptor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/ClassDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/ClassDescriptor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/ClassDescriptor.java
rename to spring-core/src/main/java/org/springframework/core/convert/ClassDescriptor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/ConversionException.java b/spring-core/src/main/java/org/springframework/core/convert/ConversionException.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/ConversionException.java
rename to spring-core/src/main/java/org/springframework/core/convert/ConversionException.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/ConversionFailedException.java b/spring-core/src/main/java/org/springframework/core/convert/ConversionFailedException.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/ConversionFailedException.java
rename to spring-core/src/main/java/org/springframework/core/convert/ConversionFailedException.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/ConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/ConversionService.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/ConversionService.java
rename to spring-core/src/main/java/org/springframework/core/convert/ConversionService.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/ConverterNotFoundException.java b/spring-core/src/main/java/org/springframework/core/convert/ConverterNotFoundException.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/ConverterNotFoundException.java
rename to spring-core/src/main/java/org/springframework/core/convert/ConverterNotFoundException.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/FieldDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/FieldDescriptor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/FieldDescriptor.java
rename to spring-core/src/main/java/org/springframework/core/convert/FieldDescriptor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/ParameterDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/ParameterDescriptor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/ParameterDescriptor.java
rename to spring-core/src/main/java/org/springframework/core/convert/ParameterDescriptor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/Property.java b/spring-core/src/main/java/org/springframework/core/convert/Property.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/Property.java
rename to spring-core/src/main/java/org/springframework/core/convert/Property.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
rename to spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/converter/ConditionalGenericConverter.java b/spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalGenericConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/converter/ConditionalGenericConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalGenericConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/converter/Converter.java b/spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/converter/Converter.java
rename to spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/converter/ConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/converter/ConverterFactory.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/converter/ConverterFactory.java
rename to spring-core/src/main/java/org/springframework/core/convert/converter/ConverterFactory.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java b/spring-core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java
rename to spring-core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java b/spring-core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/converter/package-info.java b/spring-core/src/main/java/org/springframework/core/convert/converter/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/converter/package-info.java
rename to spring-core/src/main/java/org/springframework/core/convert/converter/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/package-info.java b/spring-core/src/main/java/org/springframework/core/convert/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/package-info.java
rename to spring-core/src/main/java/org/springframework/core/convert/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToArrayConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToArrayConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToArrayConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ArrayToArrayConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToObjectConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToObjectConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ArrayToObjectConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToStringConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToStringConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ArrayToStringConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConfigurableConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/support/ConfigurableConversionService.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ConfigurableConversionService.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ConfigurableConversionService.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionUtils.java b/spring-core/src/main/java/org/springframework/core/convert/support/ConversionUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionUtils.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ConversionUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/EnumToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/EnumToStringConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/EnumToStringConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/EnumToStringConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToArrayConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToArrayConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToArrayConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ObjectToArrayConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/package-info.java b/spring-core/src/main/java/org/springframework/core/convert/support/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/convert/support/package-info.java
rename to spring-core/src/main/java/org/springframework/core/convert/support/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
rename to spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
rename to spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
rename to spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnum.java
rename to spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java
rename to spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
rename to spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java
rename to spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
rename to spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java
rename to spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
rename to spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/package-info.java b/spring-core/src/main/java/org/springframework/core/enums/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/enums/package-info.java
rename to spring-core/src/main/java/org/springframework/core/enums/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
rename to spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java b/spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
rename to spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/CommandLineArgs.java b/spring-core/src/main/java/org/springframework/core/env/CommandLineArgs.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/CommandLineArgs.java
rename to spring-core/src/main/java/org/springframework/core/env/CommandLineArgs.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
rename to spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java
rename to spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java b/spring-core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java
rename to spring-core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/EnumerablePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/EnumerablePropertySource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/EnumerablePropertySource.java
rename to spring-core/src/main/java/org/springframework/core/env/EnumerablePropertySource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/Environment.java b/spring-core/src/main/java/org/springframework/core/env/Environment.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/Environment.java
rename to spring-core/src/main/java/org/springframework/core/env/Environment.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/EnvironmentCapable.java b/spring-core/src/main/java/org/springframework/core/env/EnvironmentCapable.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/EnvironmentCapable.java
rename to spring-core/src/main/java/org/springframework/core/env/EnvironmentCapable.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
rename to spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/MapPropertySource.java b/spring-core/src/main/java/org/springframework/core/env/MapPropertySource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/MapPropertySource.java
rename to spring-core/src/main/java/org/springframework/core/env/MapPropertySource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/MissingRequiredPropertiesException.java b/spring-core/src/main/java/org/springframework/core/env/MissingRequiredPropertiesException.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/MissingRequiredPropertiesException.java
rename to spring-core/src/main/java/org/springframework/core/env/MissingRequiredPropertiesException.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/MutablePropertySources.java b/spring-core/src/main/java/org/springframework/core/env/MutablePropertySources.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/MutablePropertySources.java
rename to spring-core/src/main/java/org/springframework/core/env/MutablePropertySources.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/PropertiesPropertySource.java b/spring-core/src/main/java/org/springframework/core/env/PropertiesPropertySource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/PropertiesPropertySource.java
rename to spring-core/src/main/java/org/springframework/core/env/PropertiesPropertySource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/PropertyResolver.java b/spring-core/src/main/java/org/springframework/core/env/PropertyResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/PropertyResolver.java
rename to spring-core/src/main/java/org/springframework/core/env/PropertyResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/PropertySource.java b/spring-core/src/main/java/org/springframework/core/env/PropertySource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/PropertySource.java
rename to spring-core/src/main/java/org/springframework/core/env/PropertySource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/PropertySources.java b/spring-core/src/main/java/org/springframework/core/env/PropertySources.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/PropertySources.java
rename to spring-core/src/main/java/org/springframework/core/env/PropertySources.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java b/spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
rename to spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java b/spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java
rename to spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/SimpleCommandLineArgsParser.java b/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLineArgsParser.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/SimpleCommandLineArgsParser.java
rename to spring-core/src/main/java/org/springframework/core/env/SimpleCommandLineArgsParser.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java
rename to spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/StandardEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/StandardEnvironment.java
rename to spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java b/spring-core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java
rename to spring-core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/package-info.java b/spring-core/src/main/java/org/springframework/core/env/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/env/package-info.java
rename to spring-core/src/main/java/org/springframework/core/env/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java b/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
rename to spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/AbstractResource.java b/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/AbstractResource.java
rename to spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/ByteArrayResource.java b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/ByteArrayResource.java
rename to spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/ClassPathResource.java b/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/ClassPathResource.java
rename to spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
rename to spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/ContextResource.java b/spring-core/src/main/java/org/springframework/core/io/ContextResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/ContextResource.java
rename to spring-core/src/main/java/org/springframework/core/io/ContextResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
rename to spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/DescriptiveResource.java b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/DescriptiveResource.java
rename to spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/FileSystemResource.java b/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/FileSystemResource.java
rename to spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java
rename to spring-core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/InputStreamResource.java b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/InputStreamResource.java
rename to spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/InputStreamSource.java b/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/InputStreamSource.java
rename to spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/Resource.java b/spring-core/src/main/java/org/springframework/core/io/Resource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/Resource.java
rename to spring-core/src/main/java/org/springframework/core/io/Resource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/ResourceEditor.java b/spring-core/src/main/java/org/springframework/core/io/ResourceEditor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/ResourceEditor.java
rename to spring-core/src/main/java/org/springframework/core/io/ResourceEditor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/ResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/ResourceLoader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/ResourceLoader.java
rename to spring-core/src/main/java/org/springframework/core/io/ResourceLoader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/UrlResource.java b/spring-core/src/main/java/org/springframework/core/io/UrlResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/UrlResource.java
rename to spring-core/src/main/java/org/springframework/core/io/UrlResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/VfsResource.java b/spring-core/src/main/java/org/springframework/core/io/VfsResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/VfsResource.java
rename to spring-core/src/main/java/org/springframework/core/io/VfsResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/VfsUtils.java b/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/VfsUtils.java
rename to spring-core/src/main/java/org/springframework/core/io/VfsUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/WritableResource.java b/spring-core/src/main/java/org/springframework/core/io/WritableResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/WritableResource.java
rename to spring-core/src/main/java/org/springframework/core/io/WritableResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/package-info.java b/spring-core/src/main/java/org/springframework/core/io/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/package-info.java
rename to spring-core/src/main/java/org/springframework/core/io/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/EncodedResource.java b/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/support/EncodedResource.java
rename to spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java b/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java
rename to spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java b/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
rename to spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java b/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java
rename to spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java b/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java
rename to spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java b/spring-core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java
rename to spring-core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/ResourcePatternResolver.java b/spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/support/ResourcePatternResolver.java
rename to spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java b/spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java
rename to spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/ResourcePropertySource.java b/spring-core/src/main/java/org/springframework/core/io/support/ResourcePropertySource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/support/ResourcePropertySource.java
rename to spring-core/src/main/java/org/springframework/core/io/support/ResourcePropertySource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/VfsPatternUtils.java b/spring-core/src/main/java/org/springframework/core/io/support/VfsPatternUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/support/VfsPatternUtils.java
rename to spring-core/src/main/java/org/springframework/core/io/support/VfsPatternUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/package-info.java b/spring-core/src/main/java/org/springframework/core/io/support/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/io/support/package-info.java
rename to spring-core/src/main/java/org/springframework/core/io/support/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/package-info.java b/spring-core/src/main/java/org/springframework/core/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/package-info.java
rename to spring-core/src/main/java/org/springframework/core/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
rename to spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
rename to spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/serializer/Deserializer.java b/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/serializer/Deserializer.java
rename to spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/serializer/Serializer.java b/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/serializer/Serializer.java
rename to spring-core/src/main/java/org/springframework/core/serializer/Serializer.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/serializer/package-info.java b/spring-core/src/main/java/org/springframework/core/serializer/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/serializer/package-info.java
rename to spring-core/src/main/java/org/springframework/core/serializer/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java b/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java
rename to spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
rename to spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java
rename to spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/serializer/support/package-info.java b/spring-core/src/main/java/org/springframework/core/serializer/support/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/serializer/support/package-info.java
rename to spring-core/src/main/java/org/springframework/core/serializer/support/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
rename to spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/style/DefaultValueStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
rename to spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/style/StylerUtils.java b/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/style/StylerUtils.java
rename to spring-core/src/main/java/org/springframework/core/style/StylerUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/style/ToStringCreator.java b/spring-core/src/main/java/org/springframework/core/style/ToStringCreator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/style/ToStringCreator.java
rename to spring-core/src/main/java/org/springframework/core/style/ToStringCreator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/style/ToStringStyler.java b/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/style/ToStringStyler.java
rename to spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/style/ValueStyler.java b/spring-core/src/main/java/org/springframework/core/style/ValueStyler.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/style/ValueStyler.java
rename to spring-core/src/main/java/org/springframework/core/style/ValueStyler.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/style/package-info.java b/spring-core/src/main/java/org/springframework/core/style/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/style/package-info.java
rename to spring-core/src/main/java/org/springframework/core/style/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
rename to spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
rename to spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
rename to spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/task/TaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/task/TaskExecutor.java
rename to spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/task/TaskRejectedException.java b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/task/TaskRejectedException.java
rename to spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/task/TaskTimeoutException.java b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
rename to spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/task/package-info.java b/spring-core/src/main/java/org/springframework/core/task/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/task/package-info.java
rename to spring-core/src/main/java/org/springframework/core/task/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java
rename to spring-core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
rename to spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java
rename to spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/task/support/package-info.java b/spring-core/src/main/java/org/springframework/core/task/support/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/task/support/package-info.java
rename to spring-core/src/main/java/org/springframework/core/task/support/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/AnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
rename to spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/ClassMetadata.java b/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/ClassMetadata.java
rename to spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/MethodMetadata.java b/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/MethodMetadata.java
rename to spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
rename to spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/StandardClassMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
rename to spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
rename to spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
rename to spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
rename to spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java b/spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java
rename to spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
rename to spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MetadataReader.java b/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/classreading/MetadataReader.java
rename to spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java b/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java
rename to spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
rename to spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
rename to spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java
rename to spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/package-info.java b/spring-core/src/main/java/org/springframework/core/type/classreading/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/classreading/package-info.java
rename to spring-core/src/main/java/org/springframework/core/type/classreading/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/filter/AbstractClassTestingTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractClassTestingTypeFilter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/filter/AbstractClassTestingTypeFilter.java
rename to spring-core/src/main/java/org/springframework/core/type/filter/AbstractClassTestingTypeFilter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java
rename to spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java
rename to spring-core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/filter/AspectJTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AspectJTypeFilter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/filter/AspectJTypeFilter.java
rename to spring-core/src/main/java/org/springframework/core/type/filter/AspectJTypeFilter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java
rename to spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/filter/RegexPatternTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/RegexPatternTypeFilter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/filter/RegexPatternTypeFilter.java
rename to spring-core/src/main/java/org/springframework/core/type/filter/RegexPatternTypeFilter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/filter/TypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/TypeFilter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/filter/TypeFilter.java
rename to spring-core/src/main/java/org/springframework/core/type/filter/TypeFilter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/filter/package-info.java b/spring-core/src/main/java/org/springframework/core/type/filter/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/filter/package-info.java
rename to spring-core/src/main/java/org/springframework/core/type/filter/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/package-info.java b/spring-core/src/main/java/org/springframework/core/type/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/core/type/package-info.java
rename to spring-core/src/main/java/org/springframework/core/type/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/AntPathMatcher.java
rename to spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/AntPathStringMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathStringMatcher.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/AntPathStringMatcher.java
rename to spring-core/src/main/java/org/springframework/util/AntPathStringMatcher.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/Assert.java b/spring-core/src/main/java/org/springframework/util/Assert.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/Assert.java
rename to spring-core/src/main/java/org/springframework/util/Assert.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/AutoPopulatingList.java b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/AutoPopulatingList.java
rename to spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/CachingMapDecorator.java b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/CachingMapDecorator.java
rename to spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/ClassUtils.java b/spring-core/src/main/java/org/springframework/util/ClassUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/ClassUtils.java
rename to spring-core/src/main/java/org/springframework/util/ClassUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/CollectionUtils.java
rename to spring-core/src/main/java/org/springframework/util/CollectionUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/CommonsLogWriter.java b/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/CommonsLogWriter.java
rename to spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/CompositeIterator.java b/spring-core/src/main/java/org/springframework/util/CompositeIterator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/CompositeIterator.java
rename to spring-core/src/main/java/org/springframework/util/CompositeIterator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
rename to spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/CustomizableThreadCreator.java b/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/CustomizableThreadCreator.java
rename to spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java b/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
rename to spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/DigestUtils.java b/spring-core/src/main/java/org/springframework/util/DigestUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/DigestUtils.java
rename to spring-core/src/main/java/org/springframework/util/DigestUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/ErrorHandler.java b/spring-core/src/main/java/org/springframework/util/ErrorHandler.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/ErrorHandler.java
rename to spring-core/src/main/java/org/springframework/util/ErrorHandler.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/FileCopyUtils.java b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/FileCopyUtils.java
rename to spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/FileSystemUtils.java b/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/FileSystemUtils.java
rename to spring-core/src/main/java/org/springframework/util/FileSystemUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
rename to spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/LinkedMultiValueMap.java b/spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
rename to spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/Log4jConfigurer.java b/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/Log4jConfigurer.java
rename to spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/MethodInvoker.java b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/MethodInvoker.java
rename to spring-core/src/main/java/org/springframework/util/MethodInvoker.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/MultiValueMap.java b/spring-core/src/main/java/org/springframework/util/MultiValueMap.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/MultiValueMap.java
rename to spring-core/src/main/java/org/springframework/util/MultiValueMap.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/NumberUtils.java b/spring-core/src/main/java/org/springframework/util/NumberUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/NumberUtils.java
rename to spring-core/src/main/java/org/springframework/util/NumberUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/ObjectUtils.java
rename to spring-core/src/main/java/org/springframework/util/ObjectUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/PathMatcher.java b/spring-core/src/main/java/org/springframework/util/PathMatcher.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/PathMatcher.java
rename to spring-core/src/main/java/org/springframework/util/PathMatcher.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/PatternMatchUtils.java b/spring-core/src/main/java/org/springframework/util/PatternMatchUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/PatternMatchUtils.java
rename to spring-core/src/main/java/org/springframework/util/PatternMatchUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/PropertiesPersister.java b/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/PropertiesPersister.java
rename to spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java b/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
rename to spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/ReflectionUtils.java b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/ReflectionUtils.java
rename to spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/ResourceUtils.java b/spring-core/src/main/java/org/springframework/util/ResourceUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/ResourceUtils.java
rename to spring-core/src/main/java/org/springframework/util/ResourceUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/SerializationUtils.java b/spring-core/src/main/java/org/springframework/util/SerializationUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/SerializationUtils.java
rename to spring-core/src/main/java/org/springframework/util/SerializationUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/StopWatch.java b/spring-core/src/main/java/org/springframework/util/StopWatch.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/StopWatch.java
rename to spring-core/src/main/java/org/springframework/util/StopWatch.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/StringUtils.java
rename to spring-core/src/main/java/org/springframework/util/StringUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/StringValueResolver.java b/spring-core/src/main/java/org/springframework/util/StringValueResolver.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/StringValueResolver.java
rename to spring-core/src/main/java/org/springframework/util/StringValueResolver.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/SystemPropertyUtils.java b/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/SystemPropertyUtils.java
rename to spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/TypeUtils.java b/spring-core/src/main/java/org/springframework/util/TypeUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/TypeUtils.java
rename to spring-core/src/main/java/org/springframework/util/TypeUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/WeakReferenceMonitor.java b/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/WeakReferenceMonitor.java
rename to spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/comparator/BooleanComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
rename to spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/comparator/ComparableComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/ComparableComparator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/comparator/ComparableComparator.java
rename to spring-core/src/main/java/org/springframework/util/comparator/ComparableComparator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/comparator/CompoundComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
rename to spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
rename to spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
rename to spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/comparator/package-info.java b/spring-core/src/main/java/org/springframework/util/comparator/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/comparator/package-info.java
rename to spring-core/src/main/java/org/springframework/util/comparator/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/package-info.java b/spring-core/src/main/java/org/springframework/util/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/package-info.java
rename to spring-core/src/main/java/org/springframework/util/package-info.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
rename to spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
rename to spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
rename to spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
rename to spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/DomContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/DomContentHandler.java
rename to spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/DomUtils.java b/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/DomUtils.java
rename to spring-core/src/main/java/org/springframework/util/xml/DomUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
rename to spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
rename to spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
rename to spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java
rename to spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java
rename to spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/StaxResult.java b/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/StaxResult.java
rename to spring-core/src/main/java/org/springframework/util/xml/StaxResult.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/StaxSource.java b/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/StaxSource.java
rename to spring-core/src/main/java/org/springframework/util/xml/StaxSource.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
rename to spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java
rename to spring-core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/StaxUtils.java b/spring-core/src/main/java/org/springframework/util/xml/StaxUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/StaxUtils.java
rename to spring-core/src/main/java/org/springframework/util/xml/StaxUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/TransformerUtils.java b/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/TransformerUtils.java
rename to spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java
rename to spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java
rename to spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java b/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
rename to spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/package-info.java b/spring-core/src/main/java/org/springframework/util/xml/package-info.java
similarity index 100%
rename from org.springframework.core/src/main/java/org/springframework/util/xml/package-info.java
rename to spring-core/src/main/java/org/springframework/util/xml/package-info.java
diff --git a/org.springframework.core/src/main/java/overview.html b/spring-core/src/main/java/overview.html
similarity index 100%
rename from org.springframework.core/src/main/java/overview.html
rename to spring-core/src/main/java/overview.html
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/Colour.java b/spring-core/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/Colour.java
rename to spring-core/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/CustomEnum.java b/spring-core/src/test/java/org/springframework/beans/CustomEnum.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/CustomEnum.java
rename to spring-core/src/test/java/org/springframework/beans/CustomEnum.java
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/DerivedTestBean.java
rename to spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/GenericBean.java b/spring-core/src/test/java/org/springframework/beans/GenericBean.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/GenericBean.java
rename to spring-core/src/test/java/org/springframework/beans/GenericBean.java
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-core/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/IOther.java b/spring-core/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/IOther.java
rename to spring-core/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/ITestBean.java b/spring-core/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-core/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-core/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-core/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/TestBean.java b/spring-core/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/TestBean.java
rename to spring-core/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/factory/annotation/Autowired.java b/spring-core/src/test/java/org/springframework/beans/factory/annotation/Autowired.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/factory/annotation/Autowired.java
rename to spring-core/src/test/java/org/springframework/beans/factory/annotation/Autowired.java
diff --git a/org.springframework.core/src/test/java/org/springframework/beans/factory/annotation/Qualifier.java b/spring-core/src/test/java/org/springframework/beans/factory/annotation/Qualifier.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/beans/factory/annotation/Qualifier.java
rename to spring-core/src/test/java/org/springframework/beans/factory/annotation/Qualifier.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/AbstractControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/AbstractControlFlowTests.java
rename to spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/AbstractGenericsTests.java b/spring-core/src/test/java/org/springframework/core/AbstractGenericsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/AbstractGenericsTests.java
rename to spring-core/src/test/java/org/springframework/core/AbstractGenericsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
rename to spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
rename to spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/CollectionFactoryTests.java b/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/CollectionFactoryTests.java
rename to spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/ConstantsTests.java b/spring-core/src/test/java/org/springframework/core/ConstantsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/ConstantsTests.java
rename to spring-core/src/test/java/org/springframework/core/ConstantsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/ConventionsTests.java b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/ConventionsTests.java
rename to spring-core/src/test/java/org/springframework/core/ConventionsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/DefaultControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
rename to spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
rename to spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
rename to spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
rename to spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
rename to spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
rename to spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/MethodParameterTests.java b/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/MethodParameterTests.java
rename to spring-core/src/test/java/org/springframework/core/MethodParameterTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/NestedExceptionTests.java b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/NestedExceptionTests.java
rename to spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/OrderComparatorTests.java b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/OrderComparatorTests.java
rename to spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
rename to spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
rename to spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java b/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
rename to spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
rename to spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java
rename to spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
rename to spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java
rename to spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
rename to spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/enums/StandAloneStaticLabeledEnum.java b/spring-core/src/test/java/org/springframework/core/enums/StandAloneStaticLabeledEnum.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/enums/StandAloneStaticLabeledEnum.java
rename to spring-core/src/test/java/org/springframework/core/enums/StandAloneStaticLabeledEnum.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java
rename to spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java
rename to spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/env/PropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/env/PropertySourceTests.java
rename to spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java b/spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java
rename to spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/env/PropertySourcesTests.java b/spring-core/src/test/java/org/springframework/core/env/PropertySourcesTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/env/PropertySourcesTests.java
rename to spring-core/src/test/java/org/springframework/core/env/PropertySourcesTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/env/SimpleCommandLineParserTests.java b/spring-core/src/test/java/org/springframework/core/env/SimpleCommandLineParserTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/env/SimpleCommandLineParserTests.java
rename to spring-core/src/test/java/org/springframework/core/env/SimpleCommandLineParserTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/env/SimpleCommandLinePropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/SimpleCommandLinePropertySourceTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/env/SimpleCommandLinePropertySourceTests.java
rename to spring-core/src/test/java/org/springframework/core/env/SimpleCommandLinePropertySourceTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
rename to spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java
rename to spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/io/ClassPathResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/ClassPathResourceTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/io/ClassPathResourceTests.java
rename to spring-core/src/test/java/org/springframework/core/io/ClassPathResourceTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/io/ResourceEditorTests.java b/spring-core/src/test/java/org/springframework/core/io/ResourceEditorTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/io/ResourceEditorTests.java
rename to spring-core/src/test/java/org/springframework/core/io/ResourceEditorTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/io/ResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/io/ResourceTests.java
rename to spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/io/example.properties b/spring-core/src/test/java/org/springframework/core/io/example.properties
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/io/example.properties
rename to spring-core/src/test/java/org/springframework/core/io/example.properties
diff --git a/org.springframework.core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
rename to spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java b/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
rename to spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/io/support/ResourcePropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/io/support/ResourcePropertySourceTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/io/support/ResourcePropertySourceTests.java
rename to spring-core/src/test/java/org/springframework/core/io/support/ResourcePropertySourceTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/serializer/SerializationConverterTests.java b/spring-core/src/test/java/org/springframework/core/serializer/SerializationConverterTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/serializer/SerializationConverterTests.java
rename to spring-core/src/test/java/org/springframework/core/serializer/SerializationConverterTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
rename to spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
rename to spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/type/AbstractClassMetadataMemberClassTests.java b/spring-core/src/test/java/org/springframework/core/type/AbstractClassMetadataMemberClassTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/type/AbstractClassMetadataMemberClassTests.java
rename to spring-core/src/test/java/org/springframework/core/type/AbstractClassMetadataMemberClassTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
rename to spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/type/AnnotationTypeFilterTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationTypeFilterTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/type/AnnotationTypeFilterTests.java
rename to spring-core/src/test/java/org/springframework/core/type/AnnotationTypeFilterTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java b/spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java
rename to spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java b/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java
rename to spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
rename to spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/type/ClassloadingAssertions.java b/spring-core/src/test/java/org/springframework/core/type/ClassloadingAssertions.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/type/ClassloadingAssertions.java
rename to spring-core/src/test/java/org/springframework/core/type/ClassloadingAssertions.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/type/Scope.java b/spring-core/src/test/java/org/springframework/core/type/Scope.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/type/Scope.java
rename to spring-core/src/test/java/org/springframework/core/type/Scope.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/type/StandardClassMetadataMemberClassTests.java b/spring-core/src/test/java/org/springframework/core/type/StandardClassMetadataMemberClassTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/type/StandardClassMetadataMemberClassTests.java
rename to spring-core/src/test/java/org/springframework/core/type/StandardClassMetadataMemberClassTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitorMemberClassTests.java b/spring-core/src/test/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitorMemberClassTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitorMemberClassTests.java
rename to spring-core/src/test/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitorMemberClassTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/mock/env/MockPropertySource.java b/spring-core/src/test/java/org/springframework/mock/env/MockPropertySource.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/mock/env/MockPropertySource.java
rename to spring-core/src/test/java/org/springframework/mock/env/MockPropertySource.java
diff --git a/org.springframework.core/src/test/java/org/springframework/stereotype/Component.java b/spring-core/src/test/java/org/springframework/stereotype/Component.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/stereotype/Component.java
rename to spring-core/src/test/java/org/springframework/stereotype/Component.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/AntPathMatcherTests.java b/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/AntPathMatcherTests.java
rename to spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/AssertTests.java b/spring-core/src/test/java/org/springframework/util/AssertTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/AssertTests.java
rename to spring-core/src/test/java/org/springframework/util/AssertTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
rename to spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
rename to spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/ClassUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/CollectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/CollectionUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/CompositeIteratorTests.java b/spring-core/src/test/java/org/springframework/util/CompositeIteratorTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/CompositeIteratorTests.java
rename to spring-core/src/test/java/org/springframework/util/CompositeIteratorTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/DigestUtilsTests.java b/spring-core/src/test/java/org/springframework/util/DigestUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/DigestUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/DigestUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/FileCopyUtilsTests.java b/spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/FileCopyUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/FileSystemUtilsTests.java b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java b/spring-core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java
rename to spring-core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/Log4jConfigurerTests.java b/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
rename to spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/MethodInvokerTests.java b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/MethodInvokerTests.java
rename to spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/MockLog4jAppender.java b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/MockLog4jAppender.java
rename to spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/NumberUtilsTests.java b/spring-core/src/test/java/org/springframework/util/NumberUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/NumberUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/NumberUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/ObjectUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/ObjectUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java b/spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/PropertiesPersisterTests.java b/spring-core/src/test/java/org/springframework/util/PropertiesPersisterTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/PropertiesPersisterTests.java
rename to spring-core/src/test/java/org/springframework/util/PropertiesPersisterTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java b/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
rename to spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/ResourceUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/ResourceUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/SerializationTestUtils.java
rename to spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/SerializationUtilsTests.java b/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/SerializationUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/StopWatchTests.java b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/StopWatchTests.java
rename to spring-core/src/test/java/org/springframework/util/StopWatchTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/StringUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/SystemPropertyUtilsTests.java b/spring-core/src/test/java/org/springframework/util/SystemPropertyUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/SystemPropertyUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/SystemPropertyUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/TypeUtilsTests.java b/spring-core/src/test/java/org/springframework/util/TypeUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/TypeUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/TypeUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/comparator/ComparatorTests.java b/spring-core/src/test/java/org/springframework/util/comparator/ComparatorTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/comparator/ComparatorTests.java
rename to spring-core/src/test/java/org/springframework/util/comparator/ComparatorTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/AbstractStaxContentHandlerTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxContentHandlerTestCase.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/AbstractStaxContentHandlerTestCase.java
rename to spring-core/src/test/java/org/springframework/util/xml/AbstractStaxContentHandlerTestCase.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
rename to spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/DomContentHandlerTest.java b/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTest.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/DomContentHandlerTest.java
rename to spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTest.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java b/spring-core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java
rename to spring-core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxEventContentHandlerTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxEventContentHandlerTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/StaxEventContentHandlerTests.java
rename to spring-core/src/test/java/org/springframework/util/xml/StaxEventContentHandlerTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
rename to spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxResultTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxResultTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/StaxResultTests.java
rename to spring-core/src/test/java/org/springframework/util/xml/StaxResultTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxSourceTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxSourceTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/StaxSourceTests.java
rename to spring-core/src/test/java/org/springframework/util/xml/StaxSourceTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxStreamContentHandlerTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamContentHandlerTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/StaxStreamContentHandlerTests.java
rename to spring-core/src/test/java/org/springframework/util/xml/StaxStreamContentHandlerTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
rename to spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxUtilsTest.java b/spring-core/src/test/java/org/springframework/util/xml/StaxUtilsTest.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/StaxUtilsTest.java
rename to spring-core/src/test/java/org/springframework/util/xml/StaxUtilsTest.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java b/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
rename to spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/XMLEventStreamReaderTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamReaderTests.java
rename to spring-core/src/test/java/org/springframework/util/xml/XMLEventStreamReaderTests.java
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java b/spring-core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java
similarity index 100%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java
rename to spring-core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java
diff --git a/org.springframework.core/src/test/resources/log4j.xml b/spring-core/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.core/src/test/resources/log4j.xml
rename to spring-core/src/test/resources/log4j.xml
diff --git a/org.springframework.core/src/test/resources/org/springframework/util/testlog4j.properties b/spring-core/src/test/resources/org/springframework/util/testlog4j.properties
similarity index 100%
rename from org.springframework.core/src/test/resources/org/springframework/util/testlog4j.properties
rename to spring-core/src/test/resources/org/springframework/util/testlog4j.properties
diff --git a/org.springframework.core/src/test/resources/org/springframework/util/xml/testContentHandler.xml b/spring-core/src/test/resources/org/springframework/util/xml/testContentHandler.xml
similarity index 100%
rename from org.springframework.core/src/test/resources/org/springframework/util/xml/testContentHandler.xml
rename to spring-core/src/test/resources/org/springframework/util/xml/testContentHandler.xml
diff --git a/org.springframework.core/src/test/resources/org/springframework/util/xml/testLexicalHandler.xml b/spring-core/src/test/resources/org/springframework/util/xml/testLexicalHandler.xml
similarity index 100%
rename from org.springframework.core/src/test/resources/org/springframework/util/xml/testLexicalHandler.xml
rename to spring-core/src/test/resources/org/springframework/util/xml/testLexicalHandler.xml
diff --git a/org.springframework.core/template.mf b/spring-core/template.mf
similarity index 100%
rename from org.springframework.core/template.mf
rename to spring-core/template.mf
diff --git a/org.springframework.expression/readme.txt b/spring-expression/readme.txt
similarity index 100%
rename from org.springframework.expression/readme.txt
rename to spring-expression/readme.txt
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/AccessException.java b/spring-expression/src/main/java/org/springframework/expression/AccessException.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/AccessException.java
rename to spring-expression/src/main/java/org/springframework/expression/AccessException.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/BeanResolver.java b/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/BeanResolver.java
rename to spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/ConstructorExecutor.java b/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/ConstructorExecutor.java
rename to spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/ConstructorResolver.java b/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/ConstructorResolver.java
rename to spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/EvaluationContext.java b/spring-expression/src/main/java/org/springframework/expression/EvaluationContext.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/EvaluationContext.java
rename to spring-expression/src/main/java/org/springframework/expression/EvaluationContext.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/EvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/EvaluationException.java
rename to spring-expression/src/main/java/org/springframework/expression/EvaluationException.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/Expression.java b/spring-expression/src/main/java/org/springframework/expression/Expression.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/Expression.java
rename to spring-expression/src/main/java/org/springframework/expression/Expression.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/ExpressionException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/ExpressionException.java
rename to spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
rename to spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/ExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionParser.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/ExpressionParser.java
rename to spring-expression/src/main/java/org/springframework/expression/ExpressionParser.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/MethodExecutor.java b/spring-expression/src/main/java/org/springframework/expression/MethodExecutor.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/MethodExecutor.java
rename to spring-expression/src/main/java/org/springframework/expression/MethodExecutor.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/MethodFilter.java b/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/MethodFilter.java
rename to spring-expression/src/main/java/org/springframework/expression/MethodFilter.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/MethodResolver.java b/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/MethodResolver.java
rename to spring-expression/src/main/java/org/springframework/expression/MethodResolver.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/Operation.java b/spring-expression/src/main/java/org/springframework/expression/Operation.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/Operation.java
rename to spring-expression/src/main/java/org/springframework/expression/Operation.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/OperatorOverloader.java b/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/OperatorOverloader.java
rename to spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/ParseException.java b/spring-expression/src/main/java/org/springframework/expression/ParseException.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/ParseException.java
rename to spring-expression/src/main/java/org/springframework/expression/ParseException.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/ParserContext.java b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/ParserContext.java
rename to spring-expression/src/main/java/org/springframework/expression/ParserContext.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/PropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/PropertyAccessor.java
rename to spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/TypeComparator.java b/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/TypeComparator.java
rename to spring-expression/src/main/java/org/springframework/expression/TypeComparator.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/TypeConverter.java b/spring-expression/src/main/java/org/springframework/expression/TypeConverter.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/TypeConverter.java
rename to spring-expression/src/main/java/org/springframework/expression/TypeConverter.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/TypeLocator.java b/spring-expression/src/main/java/org/springframework/expression/TypeLocator.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/TypeLocator.java
rename to spring-expression/src/main/java/org/springframework/expression/TypeLocator.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/TypedValue.java b/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/TypedValue.java
rename to spring-expression/src/main/java/org/springframework/expression/TypedValue.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
rename to spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/common/ExpressionUtils.java b/spring-expression/src/main/java/org/springframework/expression/common/ExpressionUtils.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/common/ExpressionUtils.java
rename to spring-expression/src/main/java/org/springframework/expression/common/ExpressionUtils.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/common/LiteralExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/common/LiteralExpression.java
rename to spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java
rename to spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java b/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
rename to spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ExpressionState.java b/spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/InternalParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelMessage.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelNode.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelNode.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelNode.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/SpelNode.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelParserConfiguration.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParserConfiguration.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelParserConfiguration.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/SpelParserConfiguration.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Assign.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Assign.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Assign.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/Assign.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/BooleanLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BooleanLiteral.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/BooleanLiteral.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/BooleanLiteral.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/CompoundExpression.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/CompoundExpression.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/CompoundExpression.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/CompoundExpression.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Elvis.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Elvis.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Elvis.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/Elvis.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Identifier.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Identifier.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Identifier.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/Identifier.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Literal.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Literal.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Literal.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/Literal.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/NullLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/NullLiteral.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/NullLiteral.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/NullLiteral.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpAnd.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpAnd.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpAnd.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpAnd.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpEQ.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpEQ.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpEQ.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpEQ.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpGE.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGE.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpGE.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGE.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpGT.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGT.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpGT.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGT.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpLE.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLE.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpLE.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLE.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpNE.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpNE.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpNE.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpNE.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpOr.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpOr.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpOr.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpOr.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Operator.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorNot.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorNot.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorNot.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorNot.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Projection.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/QualifiedIdentifier.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/QualifiedIdentifier.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/QualifiedIdentifier.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/QualifiedIdentifier.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Selection.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/StringLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/StringLiteral.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/StringLiteral.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/StringLiteral.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/TypeReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeReference.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/TypeReference.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeReference.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g b/spring-expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g
rename to spring-expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/Token.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/Token.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java
similarity index 100%
rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java
rename to spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/BooleanExpressionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/BooleanExpressionTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/BooleanExpressionTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/BooleanExpressionTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/InProgressTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/InProgressTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/InProgressTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/InProgressTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/IndexingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ListTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/ListTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/LiteralTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/LiteralTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/LiteralTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/OperatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/SetValueTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/SpringEL300Tests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpringEL300Tests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/SpringEL300Tests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/SpringEL300Tests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java b/spring-expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/standard/PropertiesConversionSpelTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/standard/PropertiesConversionSpelTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/standard/PropertiesConversionSpelTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/standard/PropertiesConversionSpelTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/standard/SpelParserTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelParserTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/standard/SpelParserTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelParserTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/Company.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/Company.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/Person.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/Person.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java
diff --git a/org.springframework.expression/src/test/java/org/springframework/mock/env/MockPropertySource.java b/spring-expression/src/test/java/org/springframework/mock/env/MockPropertySource.java
similarity index 100%
rename from org.springframework.expression/src/test/java/org/springframework/mock/env/MockPropertySource.java
rename to spring-expression/src/test/java/org/springframework/mock/env/MockPropertySource.java
diff --git a/org.springframework.expression/src/test/resources/log4j.xml b/spring-expression/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.expression/src/test/resources/log4j.xml
rename to spring-expression/src/test/resources/log4j.xml
diff --git a/org.springframework.expression/template.mf b/spring-expression/template.mf
similarity index 100%
rename from org.springframework.expression/template.mf
rename to spring-expression/template.mf
diff --git a/org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java
similarity index 100%
rename from org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java
rename to spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java
diff --git a/org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
similarity index 100%
rename from org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
rename to spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
diff --git a/org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java
similarity index 100%
rename from org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java
rename to spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java
diff --git a/org.springframework.instrument.tomcat/src/main/java/overview.html b/spring-instrument-tomcat/src/main/java/overview.html
similarity index 100%
rename from org.springframework.instrument.tomcat/src/main/java/overview.html
rename to spring-instrument-tomcat/src/main/java/overview.html
diff --git a/org.springframework.instrument.tomcat/src/test/java/.gitignore b/spring-instrument-tomcat/src/test/java/.gitignore
similarity index 100%
rename from org.springframework.instrument.tomcat/src/test/java/.gitignore
rename to spring-instrument-tomcat/src/test/java/.gitignore
diff --git a/org.springframework.instrument.tomcat/src/test/resources/log4j.xml b/spring-instrument-tomcat/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.instrument.tomcat/src/test/resources/log4j.xml
rename to spring-instrument-tomcat/src/test/resources/log4j.xml
diff --git a/org.springframework.instrument.tomcat/template.mf b/spring-instrument-tomcat/template.mf
similarity index 100%
rename from org.springframework.instrument.tomcat/template.mf
rename to spring-instrument-tomcat/template.mf
diff --git a/org.springframework.instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java b/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
similarity index 100%
rename from org.springframework.instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
rename to spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
diff --git a/org.springframework.instrument/src/main/java/overview.html b/spring-instrument/src/main/java/overview.html
similarity index 100%
rename from org.springframework.instrument/src/main/java/overview.html
rename to spring-instrument/src/main/java/overview.html
diff --git a/org.springframework.instrument/src/test/java/.gitignore b/spring-instrument/src/test/java/.gitignore
similarity index 100%
rename from org.springframework.instrument/src/test/java/.gitignore
rename to spring-instrument/src/test/java/.gitignore
diff --git a/org.springframework.instrument/src/test/resources/log4j.xml b/spring-instrument/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.instrument/src/test/resources/log4j.xml
rename to spring-instrument/src/test/resources/log4j.xml
diff --git a/org.springframework.instrument/template.mf b/spring-instrument/template.mf
similarity index 100%
rename from org.springframework.instrument/template.mf
rename to spring-instrument/template.mf
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/EmbeddedDatabaseBeanDefinitionParser.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/EmbeddedDatabaseBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/EmbeddedDatabaseBeanDefinitionParser.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/config/EmbeddedDatabaseBeanDefinitionParser.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/InitializeDatabaseBeanDefinitionParser.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/InitializeDatabaseBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/InitializeDatabaseBeanDefinitionParser.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/config/InitializeDatabaseBeanDefinitionParser.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/config/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/DisposableSqlTypeValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/DisposableSqlTypeValue.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/DisposableSqlTypeValue.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/DisposableSqlTypeValue.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ParameterDisposer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterDisposer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ParameterDisposer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterDisposer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlOutParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlOutParameter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlOutParameter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlOutParameter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallParameterMetaData.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallParameterMetaData.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallParameterMetaData.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallParameterMetaData.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/Db2CallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/Db2CallMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/Db2CallMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/Db2CallMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/DerbyCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/DerbyCallMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/DerbyCallMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/DerbyCallMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/DerbyTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/DerbyTableMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/DerbyTableMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/DerbyTableMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/SqlServerCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/SqlServerCallMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/SqlServerCallMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/SqlServerCallMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/SybaseCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/SybaseCallMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/SybaseCallMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/SybaseCallMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableParameterMetaData.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableParameterMetaData.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableParameterMetaData.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableParameterMetaData.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/ParsedSql.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/ParsedSql.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/ParsedSql.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/ParsedSql.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedRowMapper.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedRowMapper.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedRowMapper.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHandle.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHandle.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHandle.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHandle.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ConnectionProperties.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ConnectionProperties.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ConnectionProperties.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ConnectionProperties.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DataSourceFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DataSourceFactory.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DataSourceFactory.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DataSourceFactory.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/CannotReadScriptException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CannotReadScriptException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/CannotReadScriptException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CannotReadScriptException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptStatementFailedException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptStatementFailedException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptStatementFailedException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptStatementFailedException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/datasource/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLErrorCodesTranslation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLErrorCodesTranslation.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLErrorCodesTranslation.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLErrorCodesTranslation.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DataFieldMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DataFieldMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DataFieldMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DataFieldMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlValue.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlValue.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlValue.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/package-info.java
similarity index 100%
rename from org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/package-info.java
rename to spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/package-info.java
diff --git a/org.springframework.jdbc/src/main/java/overview.html b/spring-jdbc/src/main/java/overview.html
similarity index 100%
rename from org.springframework.jdbc/src/main/java/overview.html
rename to spring-jdbc/src/main/java/overview.html
diff --git a/org.springframework.jdbc/src/main/resources/META-INF/spring.handlers b/spring-jdbc/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from org.springframework.jdbc/src/main/resources/META-INF/spring.handlers
rename to spring-jdbc/src/main/resources/META-INF/spring.handlers
diff --git a/org.springframework.jdbc/src/main/resources/META-INF/spring.schemas b/spring-jdbc/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from org.springframework.jdbc/src/main/resources/META-INF/spring.schemas
rename to spring-jdbc/src/main/resources/META-INF/spring.schemas
diff --git a/org.springframework.jdbc/src/main/resources/META-INF/spring.tooling b/spring-jdbc/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from org.springframework.jdbc/src/main/resources/META-INF/spring.tooling
rename to spring-jdbc/src/main/resources/META-INF/spring.tooling
diff --git a/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
similarity index 100%
rename from org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
rename to spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
diff --git a/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd
similarity index 100%
rename from org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd
rename to spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd
diff --git a/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc.gif b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc.gif
similarity index 100%
rename from org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc.gif
rename to spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc.gif
diff --git a/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml b/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
similarity index 100%
rename from org.springframework.jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
rename to spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/beans/Colour.java b/spring-jdbc/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/beans/Colour.java
rename to spring-jdbc/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/beans/IOther.java b/spring-jdbc/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/beans/IOther.java
rename to spring-jdbc/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/beans/ITestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-jdbc/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-jdbc/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/beans/TestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/beans/TestBean.java
rename to spring-jdbc/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/Customer.java b/spring-jdbc/src/test/java/org/springframework/jdbc/Customer.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/Customer.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/Customer.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSourceTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSourceTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSourceTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSourceTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSourceTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSourceTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/test/SpacePerson.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/SpacePerson.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/test/SpacePerson.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/core/test/SpacePerson.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBeanTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBeanTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBeanTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBeanTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslatorTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslatorTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslatorTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml b/spring-jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml b/spring-jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml b/spring-jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml
rename to spring-jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml
diff --git a/org.springframework.jdbc/src/test/resources/data.sql b/spring-jdbc/src/test/resources/data.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/data.sql
rename to spring-jdbc/src/test/resources/data.sql
diff --git a/org.springframework.jdbc/src/test/resources/log4j.xml b/spring-jdbc/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/log4j.xml
rename to spring-jdbc/src/test/resources/log4j.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-drops.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-drops.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-drops.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-drops.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-schema-derby.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-schema-derby.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-schema-derby.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-schema-derby.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-schema.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-schema.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-schema.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-schema.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-test-data-endings.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-test-data-endings.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-test-data-endings.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-test-data-endings.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-test-data.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-test-data.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-test-data.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-test-data.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-update-data.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-update-data.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/db-update-data.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/db-update-data.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-nested-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-nested-config.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-nested-config.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-nested-config.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-config.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-config.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-config.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-nested-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-nested-config.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-nested-config.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-nested-config.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-comments.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-comments.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-comments.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-comments.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-derby.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-derby.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-derby.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-derby.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-failed-drop-comments.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-failed-drop-comments.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-failed-drop-comments.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-failed-drop-comments.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-test-data.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-test-data.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-test-data.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-test-data.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-schema-failed-drop-comments.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-schema-failed-drop-comments.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-schema-failed-drop-comments.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-schema-failed-drop-comments.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-schema.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-schema.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-schema.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-schema.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-endings.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-endings.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-endings.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-endings.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-escaped-literal.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-escaped-literal.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-escaped-literal.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-escaped-literal.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-multi-newline.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-multi-newline.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-multi-newline.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-multi-newline.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-multiple.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-multiple.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-multiple.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-multiple.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-mysql-escaped-literal.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-mysql-escaped-literal.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-mysql-escaped-literal.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-mysql-escaped-literal.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-newline.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-newline.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-newline.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-newline.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-whitespace.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-whitespace.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-whitespace.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-whitespace.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-data.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-data.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-data.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-data.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema.sql
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema.sql
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml
rename to spring-jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml
diff --git a/org.springframework.jdbc/src/test/resources/schema.sql b/spring-jdbc/src/test/resources/schema.sql
similarity index 100%
rename from org.springframework.jdbc/src/test/resources/schema.sql
rename to spring-jdbc/src/test/resources/schema.sql
diff --git a/org.springframework.jdbc/template.mf b/spring-jdbc/template.mf
similarity index 100%
rename from org.springframework.jdbc/template.mf
rename to spring-jdbc/template.mf
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/IllegalStateException.java b/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/IllegalStateException.java
rename to spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/InvalidClientIDException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
rename to spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/InvalidDestinationException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
rename to spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/InvalidSelectorException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
rename to spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/JmsException.java b/spring-jms/src/main/java/org/springframework/jms/JmsException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/JmsException.java
rename to spring-jms/src/main/java/org/springframework/jms/JmsException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/JmsSecurityException.java b/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/JmsSecurityException.java
rename to spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/MessageEOFException.java b/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/MessageEOFException.java
rename to spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/MessageFormatException.java b/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/MessageFormatException.java
rename to spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/MessageNotReadableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
rename to spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
rename to spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/ResourceAllocationException.java b/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
rename to spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/TransactionInProgressException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
rename to spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
rename to spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java b/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java
rename to spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
rename to spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/config/JcaListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/JcaListenerContainerParser.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/config/JcaListenerContainerParser.java
rename to spring-jms/src/main/java/org/springframework/jms/config/JcaListenerContainerParser.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java
rename to spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java b/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
rename to spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/config/package-info.java b/spring-jms/src/main/java/org/springframework/jms/config/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/config/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/config/package-info.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java b/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/SessionProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java b/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/package-info.java b/spring-jms/src/main/java/org/springframework/jms/connection/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/connection/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/connection/package-info.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/core/BrowserCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
rename to spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/core/JmsOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/core/JmsOperations.java
rename to spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/core/JmsTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
rename to spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
rename to spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/core/MessageCreator.java b/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/core/MessageCreator.java
rename to spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/core/MessagePostProcessor.java b/spring-jms/src/main/java/org/springframework/jms/core/MessagePostProcessor.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/core/MessagePostProcessor.java
rename to spring-jms/src/main/java/org/springframework/jms/core/MessagePostProcessor.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/core/ProducerCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
rename to spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/core/SessionCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/core/SessionCallback.java
rename to spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/core/package-info.java b/spring-jms/src/main/java/org/springframework/jms/core/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/core/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/core/package-info.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
rename to spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/core/support/package-info.java b/spring-jms/src/main/java/org/springframework/jms/core/support/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/core/support/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/core/support/package-info.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java b/spring-jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java b/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/SubscriptionNameProvider.java b/spring-jms/src/main/java/org/springframework/jms/listener/SubscriptionNameProvider.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/SubscriptionNameProvider.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/SubscriptionNameProvider.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/adapter/package-info.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/adapter/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/adapter/package-info.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecFactory.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecFactory.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecFactory.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/package-info.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/endpoint/package-info.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/package-info.java b/spring-jms/src/main/java/org/springframework/jms/listener/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/listener/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/listener/package-info.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/package-info.java b/spring-jms/src/main/java/org/springframework/jms/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/package-info.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
rename to spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
rename to spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
rename to spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/remoting/package-info.java b/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/remoting/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/JmsAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/JmsAccessor.java
rename to spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/JmsUtils.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/JmsUtils.java
rename to spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java
rename to spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
rename to spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
rename to spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java
rename to spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MessageType.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageType.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MessageType.java
rename to spring-jms/src/main/java/org/springframework/jms/support/converter/MessageType.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
rename to spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
rename to spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/package-info.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/converter/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/support/converter/package-info.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
rename to spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/destination/CachingDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/CachingDestinationResolver.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/destination/CachingDestinationResolver.java
rename to spring-jms/src/main/java/org/springframework/jms/support/destination/CachingDestinationResolver.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java
rename to spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
rename to spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
rename to spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
rename to spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
rename to spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/destination/package-info.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/destination/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/support/destination/package-info.java
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/package-info.java b/spring-jms/src/main/java/org/springframework/jms/support/package-info.java
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/support/package-info.java
rename to spring-jms/src/main/java/org/springframework/jms/support/package-info.java
diff --git a/org.springframework.jms/src/main/java/overview.html b/spring-jms/src/main/java/overview.html
similarity index 100%
rename from org.springframework.jms/src/main/java/overview.html
rename to spring-jms/src/main/java/overview.html
diff --git a/org.springframework.jms/src/main/resources/META-INF/spring.handlers b/spring-jms/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from org.springframework.jms/src/main/resources/META-INF/spring.handlers
rename to spring-jms/src/main/resources/META-INF/spring.handlers
diff --git a/org.springframework.jms/src/main/resources/META-INF/spring.schemas b/spring-jms/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from org.springframework.jms/src/main/resources/META-INF/spring.schemas
rename to spring-jms/src/main/resources/META-INF/spring.schemas
diff --git a/org.springframework.jms/src/main/resources/META-INF/spring.tooling b/spring-jms/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from org.springframework.jms/src/main/resources/META-INF/spring.tooling
rename to spring-jms/src/main/resources/META-INF/spring.tooling
diff --git a/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
similarity index 100%
rename from org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
rename to spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
diff --git a/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-3.0.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.0.xsd
similarity index 100%
rename from org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-3.0.xsd
rename to spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.0.xsd
diff --git a/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-3.1.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.1.xsd
similarity index 100%
rename from org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-3.1.xsd
rename to spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.1.xsd
diff --git a/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms.gif b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms.gif
similarity index 100%
rename from org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms.gif
rename to spring-jms/src/main/resources/org/springframework/jms/config/spring-jms.gif
diff --git a/org.springframework.jms/src/test/java/org/springframework/beans/Colour.java b/spring-jms/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/beans/Colour.java
rename to spring-jms/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/beans/IOther.java b/spring-jms/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/beans/IOther.java
rename to spring-jms/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/beans/ITestBean.java b/spring-jms/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-jms/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-jms/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/beans/TestBean.java b/spring-jms/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/beans/TestBean.java
rename to spring-jms/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java b/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java
rename to spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jca/StubActivationSpec.java b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jca/StubActivationSpec.java
rename to spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jca/StubResourceAdapter.java b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
rename to spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/StubConnectionFactory.java b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
rename to spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/StubQueue.java b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/StubQueue.java
rename to spring-jms/src/test/java/org/springframework/jms/StubQueue.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/StubTopic.java b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/StubTopic.java
rename to spring-jms/src/test/java/org/springframework/jms/StubTopic.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
rename to spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/config/jmsNamespaceHandlerTests.xml b/spring-jms/src/test/java/org/springframework/jms/config/jmsNamespaceHandlerTests.xml
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/config/jmsNamespaceHandlerTests.xml
rename to spring-jms/src/test/java/org/springframework/jms/config/jmsNamespaceHandlerTests.xml
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
rename to spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java
rename to spring-jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/connection/TestConnection.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/connection/TestConnection.java
rename to spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
rename to spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java
rename to spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
rename to spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java
rename to spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java
rename to spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
rename to spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
rename to spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
rename to spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/MessageContentsDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageContentsDelegate.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/MessageContentsDelegate.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageContentsDelegate.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/MessageDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageDelegate.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/MessageDelegate.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageDelegate.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveMessageDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveMessageDelegate.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveMessageDelegate.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveMessageDelegate.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpec.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpec.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpec.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpec.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
rename to spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
rename to spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/support/JmsAccessorTests.java b/spring-jms/src/test/java/org/springframework/jms/support/JmsAccessorTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/support/JmsAccessorTests.java
rename to spring-jms/src/test/java/org/springframework/jms/support/JmsAccessorTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java
rename to spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
rename to spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java
rename to spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java
rename to spring-jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java
rename to spring-jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java
rename to spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
rename to spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
diff --git a/org.springframework.jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
similarity index 100%
rename from org.springframework.jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
rename to spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
diff --git a/org.springframework.jms/src/test/resources/log4j.xml b/spring-jms/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.jms/src/test/resources/log4j.xml
rename to spring-jms/src/test/resources/log4j.xml
diff --git a/org.springframework.jms/template.mf b/spring-jms/template.mf
similarity index 100%
rename from org.springframework.jms/template.mf
rename to spring-jms/template.mf
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java
rename to spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java
rename to spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SessionHolder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionHolder.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SessionHolder.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionHolder.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/package-info.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/package-info.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/package-info.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/support/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate3/support/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateExceptionTranslator.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateExceptionTranslator.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateExceptionTranslator.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateExceptionTranslator.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/SessionFactoryUtils.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SessionFactoryUtils.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/SessionFactoryUtils.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SessionHolder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/SessionHolder.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SessionHolder.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/SessionHolder.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SpringSessionContext.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/SpringSessionContext.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SpringSessionContext.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/SpringSessionContext.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/package-info.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewFilter.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewFilter.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewFilter.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/support/package-info.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/support/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/support/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/hibernate4/support/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
rename to spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
rename to spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
rename to spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
rename to spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ibatis/package-info.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ibatis/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
rename to spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
rename to spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
rename to spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
rename to spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java
rename to spring-orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/package-info.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/ibatis/support/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/ibatis/support/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java b/spring-orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerHolder.java b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerHolder.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerHolder.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerHolder.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jdo/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jdo/support/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/jdo/support/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryPlus.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryPlus.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryPlus.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryPlus.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryPlusOperations.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryPlusOperations.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryPlusOperations.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryPlusOperations.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerHolder.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerHolder.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerHolder.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerHolder.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerPlus.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerPlus.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerPlus.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerPlus.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerPlusOperations.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerPlusOperations.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerPlusOperations.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerPlusOperations.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jpa/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SmartPersistenceUnitInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SmartPersistenceUnitInfo.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SmartPersistenceUnitInfo.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SmartPersistenceUnitInfo.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SpringPersistenceUnitInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SpringPersistenceUnitInfo.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SpringPersistenceUnitInfo.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SpringPersistenceUnitInfo.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/support/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/jpa/vendor/package-info.java
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/package-info.java b/spring-orm/src/main/java/org/springframework/orm/package-info.java
similarity index 100%
rename from org.springframework.orm/src/main/java/org/springframework/orm/package-info.java
rename to spring-orm/src/main/java/org/springframework/orm/package-info.java
diff --git a/org.springframework.orm/src/main/java/overview.html b/spring-orm/src/main/java/overview.html
similarity index 100%
rename from org.springframework.orm/src/main/java/overview.html
rename to spring-orm/src/main/java/overview.html
diff --git a/org.springframework.orm/src/test/java/org/springframework/beans/Colour.java b/spring-orm/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/beans/Colour.java
rename to spring-orm/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/beans/IOther.java b/spring-orm/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/beans/IOther.java
rename to spring-orm/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/beans/ITestBean.java b/spring-orm/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-orm/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-orm/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/beans/TestBean.java b/spring-orm/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/beans/TestBean.java
rename to spring-orm/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
rename to spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
rename to spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
rename to spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
rename to spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-orm/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
rename to spring-orm/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-orm/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
rename to spring-orm/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-orm/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
rename to spring-orm/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/MockFilterChain.java b/spring-orm/src/test/java/org/springframework/mock/web/MockFilterChain.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/MockFilterChain.java
rename to spring-orm/src/test/java/org/springframework/mock/web/MockFilterChain.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/MockFilterConfig.java b/spring-orm/src/test/java/org/springframework/mock/web/MockFilterConfig.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/MockFilterConfig.java
rename to spring-orm/src/test/java/org/springframework/mock/web/MockFilterConfig.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-orm/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
rename to spring-orm/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-orm/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
rename to spring-orm/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-orm/src/test/java/org/springframework/mock/web/MockHttpSession.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/MockHttpSession.java
rename to spring-orm/src/test/java/org/springframework/mock/web/MockHttpSession.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-orm/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
rename to spring-orm/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/MockServletConfig.java b/spring-orm/src/test/java/org/springframework/mock/web/MockServletConfig.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/MockServletConfig.java
rename to spring-orm/src/test/java/org/springframework/mock/web/MockServletConfig.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/MockServletContext.java b/spring-orm/src/test/java/org/springframework/mock/web/MockServletContext.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/MockServletContext.java
rename to spring-orm/src/test/java/org/springframework/mock/web/MockServletContext.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-orm/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
rename to spring-orm/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/CglibProxyBridgeMethodTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/CglibProxyBridgeMethodTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/CglibProxyBridgeMethodTests.java
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/CglibProxyBridgeMethodTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/filterDefinitions.xml b/spring-orm/src/test/java/org/springframework/orm/hibernate3/filterDefinitions.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/filterDefinitions.xml
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/filterDefinitions.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/typeDefinitions.xml b/spring-orm/src/test/java/org/springframework/orm/hibernate3/typeDefinitions.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/typeDefinitions.xml
rename to spring-orm/src/test/java/org/springframework/orm/hibernate3/typeDefinitions.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java
rename to spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java
rename to spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jdo/test.properties b/spring-orm/src/test/java/org/springframework/orm/jdo/test.properties
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jdo/test.properties
rename to spring-orm/src/test/java/org/springframework/orm/jdo/test.properties
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/META-INF/persistence.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/META-INF/persistence.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/META-INF/persistence.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/META-INF/persistence.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/ContextualPerson.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/ContextualPerson.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/ContextualPerson.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/domain/ContextualPerson.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/Person.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/persistence-context.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-context.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/persistence-context.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-context.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/persistence-multi.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-multi.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/persistence-multi.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-multi.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/persistence.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/domain/persistence.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/inject.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/inject.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/inject.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/inject.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/insertPerson.sql b/spring-orm/src/test/java/org/springframework/orm/jpa/insertPerson.sql
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/insertPerson.sql
rename to spring-orm/src/test/java/org/springframework/orm/jpa/insertPerson.sql
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/jpa-archive.jar b/spring-orm/src/test/java/org/springframework/orm/jpa/jpa-archive.jar
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/jpa-archive.jar
rename to spring-orm/src/test/java/org/springframework/orm/jpa/jpa-archive.jar
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/memdb.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/memdb.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/memdb.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/memdb.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/multi-jpa-emf.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/multi-jpa-emf.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/multi-jpa-emf.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/multi-jpa-emf.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-complex.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-complex.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-complex.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/persistence-complex.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example1.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example1.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example1.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example1.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example2.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example2.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example2.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example2.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example3.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example3.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example3.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example3.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example4.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example4.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example4.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example4.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example5.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example5.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example5.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example5.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example6.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example6.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-example6.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example6.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-invalid.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-invalid.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-invalid.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/persistence-invalid.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-no-schema.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-no-schema.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistence-no-schema.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/persistence-no-schema.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java
rename to spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager.xml
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager.xml
rename to spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager.xml
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
rename to spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
rename to spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java
rename to spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
rename to spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
rename to spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/ConditionalTestCase.java b/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/ConditionalTestCase.java
rename to spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java b/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/ExpectedException.java b/spring-orm/src/test/java/org/springframework/test/annotation/ExpectedException.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/ExpectedException.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/ExpectedException.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java b/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/NotTransactional.java b/spring-orm/src/test/java/org/springframework/test/annotation/NotTransactional.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/NotTransactional.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/NotTransactional.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/Repeat.java b/spring-orm/src/test/java/org/springframework/test/annotation/Repeat.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/Repeat.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/Repeat.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/Rollback.java b/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/Rollback.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java b/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/Timed.java b/spring-orm/src/test/java/org/springframework/test/annotation/Timed.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/annotation/Timed.java
rename to spring-orm/src/test/java/org/springframework/test/annotation/Timed.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java b/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java
rename to spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
rename to spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java b/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
rename to spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java
rename to spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java
diff --git a/org.springframework.orm/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-orm/src/test/java/org/springframework/util/SerializationTestUtils.java
similarity index 100%
rename from org.springframework.orm/src/test/java/org/springframework/util/SerializationTestUtils.java
rename to spring-orm/src/test/java/org/springframework/util/SerializationTestUtils.java
diff --git a/org.springframework.orm/src/test/resources/log4j.xml b/spring-orm/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.orm/src/test/resources/log4j.xml
rename to spring-orm/src/test/resources/log4j.xml
diff --git a/org.springframework.orm/src/test/resources/order-supplemental.jar b/spring-orm/src/test/resources/order-supplemental.jar
similarity index 100%
rename from org.springframework.orm/src/test/resources/order-supplemental.jar
rename to spring-orm/src/test/resources/order-supplemental.jar
diff --git a/org.springframework.orm/src/test/resources/order.jar b/spring-orm/src/test/resources/order.jar
similarity index 100%
rename from org.springframework.orm/src/test/resources/order.jar
rename to spring-orm/src/test/resources/order.jar
diff --git a/org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/child.xml b/spring-orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
similarity index 100%
rename from org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
rename to spring-orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
diff --git a/org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/test.xml b/spring-orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
similarity index 100%
rename from org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
rename to spring-orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
diff --git a/org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml b/spring-orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml
similarity index 100%
rename from org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml
rename to spring-orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml
diff --git a/org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml b/spring-orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml
similarity index 100%
rename from org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml
rename to spring-orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml
diff --git a/org.springframework.orm/src/test/resources/org/springframework/orm/jdo/test.properties b/spring-orm/src/test/resources/org/springframework/orm/jdo/test.properties
similarity index 100%
rename from org.springframework.orm/src/test/resources/org/springframework/orm/jdo/test.properties
rename to spring-orm/src/test/resources/org/springframework/orm/jdo/test.properties
diff --git a/org.springframework.orm/template.mf b/spring-orm/template.mf
similarity index 100%
rename from org.springframework.orm/template.mf
rename to spring-orm/template.mf
diff --git a/org.springframework.oxm/castorbuilder.properties b/spring-oxm/castorbuilder.properties
similarity index 100%
rename from org.springframework.oxm/castorbuilder.properties
rename to spring-oxm/castorbuilder.properties
diff --git a/org.springframework.oxm/oxm.gradle b/spring-oxm/oxm.gradle
similarity index 100%
rename from org.springframework.oxm/oxm.gradle
rename to spring-oxm/oxm.gradle
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/Marshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/MarshallingException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/MarshallingException.java
rename to spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
rename to spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
rename to spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/Unmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
rename to spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
rename to spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/XmlMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
rename to spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
rename to spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/castor/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/castor/package-info.java
rename to spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
rename to spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java
rename to spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
rename to spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
rename to spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
rename to spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/config/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/config/package-info.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/config/package-info.java
rename to spring-oxm/src/main/java/org/springframework/oxm/config/package-info.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java
rename to spring-oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
rename to spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/jibx/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/jibx/package-info.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/jibx/package-info.java
rename to spring-oxm/src/main/java/org/springframework/oxm/jibx/package-info.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
rename to spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/mime/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/package-info.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/mime/package-info.java
rename to spring-oxm/src/main/java/org/springframework/oxm/mime/package-info.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/package-info.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/package-info.java
rename to spring-oxm/src/main/java/org/springframework/oxm/package-info.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java b/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
rename to spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java b/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java
rename to spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/support/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/support/package-info.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/support/package-info.java
rename to spring-oxm/src/main/java/org/springframework/oxm/support/package-info.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
rename to spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java
rename to spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
rename to spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
rename to spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/xstream/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
similarity index 100%
rename from org.springframework.oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
rename to spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
diff --git a/org.springframework.oxm/src/main/resources/META-INF/spring.handlers b/spring-oxm/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from org.springframework.oxm/src/main/resources/META-INF/spring.handlers
rename to spring-oxm/src/main/resources/META-INF/spring.handlers
diff --git a/org.springframework.oxm/src/main/resources/META-INF/spring.schemas b/spring-oxm/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from org.springframework.oxm/src/main/resources/META-INF/spring.schemas
rename to spring-oxm/src/main/resources/META-INF/spring.schemas
diff --git a/org.springframework.oxm/src/main/resources/META-INF/spring.tooling b/spring-oxm/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from org.springframework.oxm/src/main/resources/META-INF/spring.tooling
rename to spring-oxm/src/main/resources/META-INF/spring.tooling
diff --git a/org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
similarity index 100%
rename from org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
rename to spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
diff --git a/org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd
similarity index 100%
rename from org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd
rename to spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd
diff --git a/org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.gif b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.gif
similarity index 100%
rename from org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.gif
rename to spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.gif
diff --git a/org.springframework.oxm/src/test/castor/castorbuilder.properties b/spring-oxm/src/test/castor/castorbuilder.properties
similarity index 100%
rename from org.springframework.oxm/src/test/castor/castorbuilder.properties
rename to spring-oxm/src/test/castor/castorbuilder.properties
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java
rename to spring-oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
rename to spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
rename to spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
rename to spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/FlightType.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/FlightType.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/FlightType.java
rename to spring-oxm/src/test/java/org/springframework/oxm/jibx/FlightType.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/Flights.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
rename to spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/xstream/Flight.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/xstream/Flight.java
rename to spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/xstream/FlightSubclass.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/FlightSubclass.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/xstream/FlightSubclass.java
rename to spring-oxm/src/test/java/org/springframework/oxm/xstream/FlightSubclass.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/xstream/Flights.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flights.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/xstream/Flights.java
rename to spring-oxm/src/test/java/org/springframework/oxm/xstream/Flights.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
similarity index 100%
rename from org.springframework.oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
rename to spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
diff --git a/org.springframework.oxm/src/test/resources/log4j.properties b/spring-oxm/src/test/resources/log4j.properties
similarity index 100%
rename from org.springframework.oxm/src/test/resources/log4j.properties
rename to spring-oxm/src/test/resources/log4j.properties
diff --git a/org.springframework.oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml b/spring-oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml
similarity index 100%
rename from org.springframework.oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml
rename to spring-oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml
diff --git a/org.springframework.oxm/src/test/resources/org/springframework/oxm/castor/order-mapping.xml b/spring-oxm/src/test/resources/org/springframework/oxm/castor/order-mapping.xml
similarity index 100%
rename from org.springframework.oxm/src/test/resources/org/springframework/oxm/castor/order-mapping.xml
rename to spring-oxm/src/test/resources/org/springframework/oxm/castor/order-mapping.xml
diff --git a/org.springframework.oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml b/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
similarity index 100%
rename from org.springframework.oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
rename to spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
diff --git a/org.springframework.oxm/src/test/resources/org/springframework/oxm/flight.xsd b/spring-oxm/src/test/resources/org/springframework/oxm/flight.xsd
similarity index 100%
rename from org.springframework.oxm/src/test/resources/org/springframework/oxm/flight.xsd
rename to spring-oxm/src/test/resources/org/springframework/oxm/flight.xsd
diff --git a/org.springframework.oxm/src/test/resources/org/springframework/oxm/jaxb/spring-ws.png b/spring-oxm/src/test/resources/org/springframework/oxm/jaxb/spring-ws.png
similarity index 100%
rename from org.springframework.oxm/src/test/resources/org/springframework/oxm/jaxb/spring-ws.png
rename to spring-oxm/src/test/resources/org/springframework/oxm/jaxb/spring-ws.png
diff --git a/org.springframework.oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml b/spring-oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml
similarity index 100%
rename from org.springframework.oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml
rename to spring-oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml
diff --git a/org.springframework.oxm/src/test/resources/org/springframework/oxm/order.xsd b/spring-oxm/src/test/resources/org/springframework/oxm/order.xsd
similarity index 100%
rename from org.springframework.oxm/src/test/resources/org/springframework/oxm/order.xsd
rename to spring-oxm/src/test/resources/org/springframework/oxm/order.xsd
diff --git a/org.springframework.oxm/template.mf b/spring-oxm/template.mf
similarity index 100%
rename from org.springframework.oxm/template.mf
rename to spring-oxm/template.mf
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
rename to spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
rename to spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java
rename to spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
rename to spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java
rename to spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
rename to spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/ActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/ActionSupport.java
rename to spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java
rename to spring-struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java
rename to spring-struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
rename to spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
rename to spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java
rename to spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
rename to spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
rename to spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java
rename to spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java
rename to spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java
rename to spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
rename to spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
diff --git a/org.springframework.web.struts/src/main/java/org/springframework/web/struts/package-info.java b/spring-struts/src/main/java/org/springframework/web/struts/package-info.java
similarity index 100%
rename from org.springframework.web.struts/src/main/java/org/springframework/web/struts/package-info.java
rename to spring-struts/src/main/java/org/springframework/web/struts/package-info.java
diff --git a/org.springframework.web.struts/src/main/resources/.gitignore b/spring-struts/src/main/resources/.gitignore
similarity index 100%
rename from org.springframework.web.struts/src/main/resources/.gitignore
rename to spring-struts/src/main/resources/.gitignore
diff --git a/org.springframework.web.struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
similarity index 100%
rename from org.springframework.web.struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
rename to spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
diff --git a/org.springframework.web.struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java
similarity index 100%
rename from org.springframework.web.struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java
rename to spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java
diff --git a/org.springframework.web.struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java b/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java
similarity index 100%
rename from org.springframework.web.struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java
rename to spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java
diff --git a/org.springframework.web.struts/src/test/java/org/springframework/web/struts/TestAction.java b/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java
similarity index 100%
rename from org.springframework.web.struts/src/test/java/org/springframework/web/struts/TestAction.java
rename to spring-struts/src/test/java/org/springframework/web/struts/TestAction.java
diff --git a/org.springframework.web.portlet/src/test/resources/log4j.xml b/spring-struts/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.web.portlet/src/test/resources/log4j.xml
rename to spring-struts/src/test/resources/log4j.xml
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages.properties b/spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages.properties
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages.properties
rename to spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages.properties
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_GB.properties b/spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages_en_GB.properties
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_GB.properties
rename to spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages_en_GB.properties
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_US.properties b/spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages_en_US.properties
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_US.properties
rename to spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages_en_US.properties
diff --git a/org.springframework.web.struts/src/test/resources/org/springframework/web/servlet/view/tiles/tiles-test.xml b/spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/tiles-test.xml
similarity index 100%
rename from org.springframework.web.struts/src/test/resources/org/springframework/web/servlet/view/tiles/tiles-test.xml
rename to spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/tiles-test.xml
diff --git a/org.springframework.web.struts/src/test/resources/org/springframework/web/struts/WEB-INF/action-servlet.xml b/spring-struts/src/test/resources/org/springframework/web/struts/WEB-INF/action-servlet.xml
similarity index 100%
rename from org.springframework.web.struts/src/test/resources/org/springframework/web/struts/WEB-INF/action-servlet.xml
rename to spring-struts/src/test/resources/org/springframework/web/struts/WEB-INF/action-servlet.xml
diff --git a/org.springframework.web.struts/template.mf b/spring-struts/template.mf
similarity index 100%
rename from org.springframework.web.struts/template.mf
rename to spring-struts/template.mf
diff --git a/org.springframework.test/.springBeans b/spring-test/.springBeans
similarity index 100%
rename from org.springframework.test/.springBeans
rename to spring-test/.springBeans
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/env/MockPropertySource.java b/spring-test/src/main/java/org/springframework/mock/env/MockPropertySource.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/env/MockPropertySource.java
rename to spring-test/src/main/java/org/springframework/mock/env/MockPropertySource.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
rename to spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
rename to spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
rename to spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/jndi/package-info.java b/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/jndi/package-info.java
rename to spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
rename to spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
rename to spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java
rename to spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockBodyContent.java b/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockBodyContent.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockFilterChain.java b/spring-test/src/main/java/org/springframework/mock/web/MockFilterChain.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockFilterChain.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockFilterChain.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockFilterConfig.java b/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpSession.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpSession.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockJspWriter.java b/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockJspWriter.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockMultipartFile.java b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockMultipartFile.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockPageContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockPageContext.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockServletConfig.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockServletConfig.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockServletContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/MockServletContext.java
rename to spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
rename to spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/package-info.java b/spring-test/src/main/java/org/springframework/mock/web/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/package-info.java
rename to spring-test/src/main/java/org/springframework/mock/web/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockActionRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionRequest.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockActionRequest.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionRequest.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockMimeResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMimeResponse.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockMimeResponse.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockMimeResponse.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/package-info.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/mock/web/portlet/package-info.java
rename to spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
rename to spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
rename to spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/AbstractSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
rename to spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
rename to spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
rename to spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/AssertThrows.java b/spring-test/src/main/java/org/springframework/test/AssertThrows.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/AssertThrows.java
rename to spring-test/src/main/java/org/springframework/test/AssertThrows.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/ConditionalTestCase.java b/spring-test/src/main/java/org/springframework/test/ConditionalTestCase.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/ConditionalTestCase.java
rename to spring-test/src/main/java/org/springframework/test/ConditionalTestCase.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
rename to spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/DirtiesContext.java b/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
rename to spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/ExpectedException.java b/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/ExpectedException.java
rename to spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/IfProfileValue.java b/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
rename to spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/NotTransactional.java b/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/NotTransactional.java
rename to spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java
rename to spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
rename to spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
rename to spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/Repeat.java b/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/Repeat.java
rename to spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/Rollback.java b/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/Rollback.java
rename to spring-test/src/main/java/org/springframework/test/annotation/Rollback.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java b/spring-test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java
rename to spring-test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/Timed.java b/spring-test/src/main/java/org/springframework/test/annotation/Timed.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/Timed.java
rename to spring-test/src/main/java/org/springframework/test/annotation/Timed.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/package-info.java b/spring-test/src/main/java/org/springframework/test/annotation/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/annotation/package-info.java
rename to spring-test/src/main/java/org/springframework/test/annotation/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/ActiveProfiles.java b/spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/ActiveProfiles.java
rename to spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/ContextCache.java b/spring-test/src/main/java/org/springframework/test/context/ContextCache.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/ContextCache.java
rename to spring-test/src/main/java/org/springframework/test/context/ContextCache.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/ContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/ContextConfiguration.java
rename to spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
rename to spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/ContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/ContextLoader.java
rename to spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java b/spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java
rename to spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
rename to spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/SmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/SmartContextLoader.java
rename to spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/TestContext.java b/spring-test/src/main/java/org/springframework/test/context/TestContext.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/TestContext.java
rename to spring-test/src/main/java/org/springframework/test/context/TestContext.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/TestContextManager.java b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/TestContextManager.java
rename to spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/TestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/TestExecutionListener.java
rename to spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/TestExecutionListeners.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
rename to spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
rename to spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
rename to spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit38/package-info.java b/spring-test/src/main/java/org/springframework/test/context/junit38/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit38/package-info.java
rename to spring-test/src/main/java/org/springframework/test/context/junit38/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java
rename to spring-test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java
rename to spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java b/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
rename to spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/package-info.java b/spring-test/src/main/java/org/springframework/test/context/junit4/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit4/package-info.java
rename to spring-test/src/main/java/org/springframework/test/context/junit4/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
rename to spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java
rename to spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
rename to spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
rename to spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
rename to spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
rename to spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java
rename to spring-test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/package-info.java b/spring-test/src/main/java/org/springframework/test/context/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/package-info.java
rename to spring-test/src/main/java/org/springframework/test/context/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
rename to spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
rename to spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
rename to spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
rename to spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
rename to spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java
rename to spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java
rename to spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java
rename to spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java
rename to spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/support/package-info.java b/spring-test/src/main/java/org/springframework/test/context/support/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/support/package-info.java
rename to spring-test/src/main/java/org/springframework/test/context/support/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java
rename to spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java
rename to spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/testng/package-info.java b/spring-test/src/main/java/org/springframework/test/context/testng/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/testng/package-info.java
rename to spring-test/src/main/java/org/springframework/test/context/testng/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
rename to spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
rename to spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java
rename to spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfigurationAttributes.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfigurationAttributes.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfigurationAttributes.java
rename to spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfigurationAttributes.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
rename to spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/package-info.java b/spring-test/src/main/java/org/springframework/test/context/transaction/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/context/transaction/package-info.java
rename to spring-test/src/main/java/org/springframework/test/context/transaction/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java b/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
rename to spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/jdbc/SimpleJdbcTestUtils.java b/spring-test/src/main/java/org/springframework/test/jdbc/SimpleJdbcTestUtils.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/jdbc/SimpleJdbcTestUtils.java
rename to spring-test/src/main/java/org/springframework/test/jdbc/SimpleJdbcTestUtils.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/jdbc/package-info.java b/spring-test/src/main/java/org/springframework/test/jdbc/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/jdbc/package-info.java
rename to spring-test/src/main/java/org/springframework/test/jdbc/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java
rename to spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
rename to spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java b/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
rename to spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/jpa/package-info.java b/spring-test/src/main/java/org/springframework/test/jpa/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/jpa/package-info.java
rename to spring-test/src/main/java/org/springframework/test/jpa/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/package-info.java b/spring-test/src/main/java/org/springframework/test/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/package-info.java
rename to spring-test/src/main/java/org/springframework/test/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java b/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java
rename to spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/util/package-info.java b/spring-test/src/main/java/org/springframework/test/util/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/util/package-info.java
rename to spring-test/src/main/java/org/springframework/test/util/package-info.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java b/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
rename to spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java b/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java
rename to spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java
diff --git a/org.springframework.test/src/main/java/org/springframework/test/web/package-info.java b/spring-test/src/main/java/org/springframework/test/web/package-info.java
similarity index 100%
rename from org.springframework.test/src/main/java/org/springframework/test/web/package-info.java
rename to spring-test/src/main/java/org/springframework/test/web/package-info.java
diff --git a/org.springframework.test/src/main/java/overview.html b/spring-test/src/main/java/overview.html
similarity index 100%
rename from org.springframework.test/src/main/java/overview.html
rename to spring-test/src/main/java/overview.html
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/Colour.java b/spring-test/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/beans/Colour.java
rename to spring-test/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/Employee.java b/spring-test/src/test/java/org/springframework/beans/Employee.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/beans/Employee.java
rename to spring-test/src/test/java/org/springframework/beans/Employee.java
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-test/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/IOther.java b/spring-test/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/beans/IOther.java
rename to spring-test/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/ITestBean.java b/spring-test/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-test/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-test/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-test/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/Pet.java b/spring-test/src/test/java/org/springframework/beans/Pet.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/beans/Pet.java
rename to spring-test/src/test/java/org/springframework/beans/Pet.java
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/TestBean.java b/spring-test/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/beans/TestBean.java
rename to spring-test/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
rename to spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
rename to spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/mock/web/MockPageContextTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
rename to spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/mock/web/MockServletContextTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
rename to spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties
rename to spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties
diff --git a/org.springframework.test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
rename to spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
rename to spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java b/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java
rename to spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests$BareAnnotations-context.xml b/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests$BareAnnotations-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests$BareAnnotations-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests$BareAnnotations-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java
rename to spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java
rename to spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java b/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
rename to spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java
rename to spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/TestContextManagerTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/TestContextManagerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java b/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
rename to spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties
rename to spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
rename to spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties
rename to spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
rename to spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests.java b/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests.java
rename to spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/InheritedConfigSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/InheritedConfigSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/InheritedConfigSpringJUnit4ClassRunnerAppCtxTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/InheritedConfigSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties
rename to spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/RelativePathSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RelativePathSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/RelativePathSpringJUnit4ClassRunnerAppCtxTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/RelativePathSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigTestSuite.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigTestSuite.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigTestSuite.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/db-schema.sql b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/db-schema.sql
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/db-schema.sql
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/db-schema.sql
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/db-test-data.sql b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/db-test-data.sql
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/db-test-data.sql
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/db-test-data.sql
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileAnnotationConfigTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileAnnotationConfigTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileAnnotationConfigTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileConfig.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileConfig.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileConfig.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileAnnotationConfigTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileAnnotationConfigTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileAnnotationConfigTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileConfig.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileConfig.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileConfig.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/annotation/ProfileAnnotationConfigTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/ProfileAnnotationConfigTestSuite.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/annotation/ProfileAnnotationConfigTestSuite.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/ProfileAnnotationConfigTestSuite.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/xml/DevProfileXmlConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DevProfileXmlConfigTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/xml/DevProfileXmlConfigTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DevProfileXmlConfigTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/xml/ProfileXmlConfigTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/ProfileXmlConfigTestSuite.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/profile/xml/ProfileXmlConfigTestSuite.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/ProfileXmlConfigTestSuite.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java
rename to spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java
rename to spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java
rename to spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
rename to spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java
rename to spring-test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java
rename to spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
rename to spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java
rename to spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java
rename to spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java
rename to spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/support/PrivateConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/PrivateConfigInnerClassTestCase.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/support/PrivateConfigInnerClassTestCase.java
rename to spring-test/src/test/java/org/springframework/test/context/support/PrivateConfigInnerClassTestCase.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
rename to spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml
rename to spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
rename to spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/testng/data.sql b/spring-test/src/test/java/org/springframework/test/context/testng/data.sql
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/testng/data.sql
rename to spring-test/src/test/java/org/springframework/test/context/testng/data.sql
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/testng/schema.sql b/spring-test/src/test/java/org/springframework/test/context/testng/schema.sql
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/context/testng/schema.sql
rename to spring-test/src/test/java/org/springframework/test/context/testng/schema.sql
diff --git a/org.springframework.test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java b/spring-test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java
rename to spring-test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java b/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
rename to spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
rename to spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/util/subpackage/Component.java b/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/util/subpackage/Component.java
rename to spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/util/subpackage/PersistentEntity.java b/spring-test/src/test/java/org/springframework/test/util/subpackage/PersistentEntity.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/util/subpackage/PersistentEntity.java
rename to spring-test/src/test/java/org/springframework/test/util/subpackage/PersistentEntity.java
diff --git a/org.springframework.test/src/test/java/org/springframework/test/util/subpackage/Person.java b/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/test/util/subpackage/Person.java
rename to spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java
diff --git a/org.springframework.test/src/test/java/org/springframework/web/multipart/MockMultipartHttpServletRequestTests.java b/spring-test/src/test/java/org/springframework/web/multipart/MockMultipartHttpServletRequestTests.java
similarity index 100%
rename from org.springframework.test/src/test/java/org/springframework/web/multipart/MockMultipartHttpServletRequestTests.java
rename to spring-test/src/test/java/org/springframework/web/multipart/MockMultipartHttpServletRequestTests.java
diff --git a/org.springframework.test/src/test/resources/log4j.xml b/spring-test/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.test/src/test/resources/log4j.xml
rename to spring-test/src/test/resources/log4j.xml
diff --git a/org.springframework.test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$ImproperDuplicateDefaultXmlAndConfigClassTestCase-context.xml b/spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$ImproperDuplicateDefaultXmlAndConfigClassTestCase-context.xml
similarity index 100%
rename from org.springframework.test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$ImproperDuplicateDefaultXmlAndConfigClassTestCase-context.xml
rename to spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$ImproperDuplicateDefaultXmlAndConfigClassTestCase-context.xml
diff --git a/org.springframework.test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$XmlTestCase-context.xml b/spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$XmlTestCase-context.xml
similarity index 100%
rename from org.springframework.test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$XmlTestCase-context.xml
rename to spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$XmlTestCase-context.xml
diff --git a/org.springframework.test/template.mf b/spring-test/template.mf
similarity index 100%
rename from org.springframework.test/template.mf
rename to spring-test/template.mf
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/CannotAcquireLockException.java b/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/CannotAcquireLockException.java
rename to spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java b/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java
rename to spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/ConcurrencyFailureException.java b/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/ConcurrencyFailureException.java
rename to spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/DataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/DataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java
rename to spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/DataIntegrityViolationException.java b/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/DataIntegrityViolationException.java
rename to spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/DataRetrievalFailureException.java b/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
rename to spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/DuplicateKeyException.java b/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/DuplicateKeyException.java
rename to spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/IncorrectResultSizeDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/IncorrectResultSizeDataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/IncorrectResultSizeDataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/IncorrectResultSizeDataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java
rename to spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
rename to spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/NonTransientDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/NonTransientDataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java
rename to spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java b/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java
rename to spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java b/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java
rename to spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/RecoverableDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/RecoverableDataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/TransientDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/TransientDataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java
rename to spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java
rename to spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
rename to spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java
rename to spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/annotation/package-info.java b/spring-tx/src/main/java/org/springframework/dao/annotation/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/annotation/package-info.java
rename to spring-tx/src/main/java/org/springframework/dao/annotation/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/package-info.java b/spring-tx/src/main/java/org/springframework/dao/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/package-info.java
rename to spring-tx/src/main/java/org/springframework/dao/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java b/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
rename to spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/support/DaoSupport.java b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/support/DaoSupport.java
rename to spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/support/DataAccessUtils.java b/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/support/DataAccessUtils.java
rename to spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
rename to spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
rename to spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/dao/support/package-info.java b/spring-tx/src/main/java/org/springframework/dao/support/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/dao/support/package-info.java
rename to spring-tx/src/main/java/org/springframework/dao/support/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/connection/package-info.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/connection/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/CciOperations.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciOperations.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/CciOperations.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/core/CciOperations.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/CciTemplate.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/RecordCreator.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/package-info.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/core/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/support/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/core/support/package-info.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/object/EisOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/object/EisOperation.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/object/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/object/package-info.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/cci/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/cci/package-info.java
rename to spring-tx/src/main/java/org/springframework/jca/cci/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/context/BootstrapContextAware.java b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
rename to spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
rename to spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java b/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
rename to spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
rename to spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/context/package-info.java b/spring-tx/src/main/java/org/springframework/jca/context/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/context/package-info.java
rename to spring-tx/src/main/java/org/springframework/jca/context/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/context/ra.xml b/spring-tx/src/main/java/org/springframework/jca/context/ra.xml
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/context/ra.xml
rename to spring-tx/src/main/java/org/springframework/jca/context/ra.xml
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
rename to spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
rename to spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
rename to spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/endpoint/package-info.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/endpoint/package-info.java
rename to spring-tx/src/main/java/org/springframework/jca/endpoint/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
rename to spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
rename to spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
rename to spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/support/package-info.java b/spring-tx/src/main/java/org/springframework/jca/support/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/support/package-info.java
rename to spring-tx/src/main/java/org/springframework/jca/support/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/work/DelegatingWork.java b/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/work/DelegatingWork.java
rename to spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java b/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
rename to spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
rename to spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/work/glassfish/GlassFishWorkManagerTaskExecutor.java b/spring-tx/src/main/java/org/springframework/jca/work/glassfish/GlassFishWorkManagerTaskExecutor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/work/glassfish/GlassFishWorkManagerTaskExecutor.java
rename to spring-tx/src/main/java/org/springframework/jca/work/glassfish/GlassFishWorkManagerTaskExecutor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/work/glassfish/package-info.java b/spring-tx/src/main/java/org/springframework/jca/work/glassfish/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/work/glassfish/package-info.java
rename to spring-tx/src/main/java/org/springframework/jca/work/glassfish/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerTaskExecutor.java b/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerTaskExecutor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerTaskExecutor.java
rename to spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerTaskExecutor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java b/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java
rename to spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/work/jboss/package-info.java b/spring-tx/src/main/java/org/springframework/jca/work/jboss/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/work/jboss/package-info.java
rename to spring-tx/src/main/java/org/springframework/jca/work/jboss/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/work/package-info.java b/spring-tx/src/main/java/org/springframework/jca/work/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/jca/work/package-info.java
rename to spring-tx/src/main/java/org/springframework/jca/work/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java
rename to spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/HeuristicCompletionException.java b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
rename to spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java b/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java
rename to spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java b/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java
rename to spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/InvalidTimeoutException.java b/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/InvalidTimeoutException.java
rename to spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java b/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java
rename to spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/NoTransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/NoTransactionException.java
rename to spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/PlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/PlatformTransactionManager.java
rename to spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/SavepointManager.java b/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/SavepointManager.java
rename to spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionDefinition.java
rename to spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionException.java
rename to spring-tx/src/main/java/org/springframework/transaction/TransactionException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionStatus.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionStatus.java
rename to spring-tx/src/main/java/org/springframework/transaction/TransactionStatus.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java
rename to spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionSystemException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionSystemException.java
rename to spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionTimedOutException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionTimedOutException.java
rename to spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionUsageException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/TransactionUsageException.java
rename to spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java b/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java
rename to spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/Isolation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/Isolation.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/Propagation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/Propagation.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/Transactional.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/Transactional.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/package-info.java
rename to spring-tx/src/main/java/org/springframework/transaction/annotation/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java b/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java
rename to spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java b/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java
rename to spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java b/spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java
rename to spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java b/spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java
rename to spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java b/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
rename to spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/config/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/config/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/config/package-info.java
rename to spring-tx/src/main/java/org/springframework/transaction/config/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/package-info.java
rename to spring-tx/src/main/java/org/springframework/transaction/interceptor/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/TransactionFactory.java b/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/jta/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/jta/package-info.java
rename to spring-tx/src/main/java/org/springframework/transaction/jta/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/package-info.java
rename to spring-tx/src/main/java/org/springframework/transaction/package-info.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/ResourceHolder.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolder.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/ResourceHolder.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolder.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/SmartTransactionObject.java b/spring-tx/src/main/java/org/springframework/transaction/support/SmartTransactionObject.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/SmartTransactionObject.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/SmartTransactionObject.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionCallback.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionCallback.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionOperations.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionOperations.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionTemplate.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/support/package-info.java
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/support/package-info.java
rename to spring-tx/src/main/java/org/springframework/transaction/support/package-info.java
diff --git a/org.springframework.transaction/src/main/java/overview.html b/spring-tx/src/main/java/overview.html
similarity index 100%
rename from org.springframework.transaction/src/main/java/overview.html
rename to spring-tx/src/main/java/overview.html
diff --git a/org.springframework.transaction/src/main/resources/META-INF/spring.handlers b/spring-tx/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from org.springframework.transaction/src/main/resources/META-INF/spring.handlers
rename to spring-tx/src/main/resources/META-INF/spring.handlers
diff --git a/org.springframework.transaction/src/main/resources/META-INF/spring.schemas b/spring-tx/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from org.springframework.transaction/src/main/resources/META-INF/spring.schemas
rename to spring-tx/src/main/resources/META-INF/spring.schemas
diff --git a/org.springframework.transaction/src/main/resources/META-INF/spring.tooling b/spring-tx/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from org.springframework.transaction/src/main/resources/META-INF/spring.tooling
rename to spring-tx/src/main/resources/META-INF/spring.tooling
diff --git a/org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd
similarity index 100%
rename from org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd
rename to spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd
diff --git a/org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-2.5.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.5.xsd
similarity index 100%
rename from org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-2.5.xsd
rename to spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.5.xsd
diff --git a/org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-3.0.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.0.xsd
similarity index 100%
rename from org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-3.0.xsd
rename to spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.0.xsd
diff --git a/org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-3.1.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.1.xsd
similarity index 100%
rename from org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-3.1.xsd
rename to spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.1.xsd
diff --git a/org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx.gif b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx.gif
similarity index 100%
rename from org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx.gif
rename to spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx.gif
diff --git a/org.springframework.transaction/src/test/java/org/springframework/beans/Colour.java b/spring-tx/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/beans/Colour.java
rename to spring-tx/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/beans/DerivedTestBean.java
rename to spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/beans/IOther.java b/spring-tx/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/beans/IOther.java
rename to spring-tx/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/beans/ITestBean.java b/spring-tx/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-tx/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-tx/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/beans/TestBean.java b/spring-tx/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/beans/TestBean.java
rename to spring-tx/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
rename to spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
rename to spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationInterceptorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationInterceptorTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationInterceptorTests.java
rename to spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationInterceptorTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
rename to spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java b/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java
rename to spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java
rename to spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
rename to spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
rename to spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/jca/cci/EisOperationTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/jca/cci/EisOperationTests.java
rename to spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java b/spring-tx/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java
rename to spring-tx/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
rename to spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
rename to spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
rename to spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
rename to spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java
rename to spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/MockJtaTransaction.java
rename to spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/TestTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/TestTransactionManager.java
rename to spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/TransactionSupportTests.java b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/TransactionSupportTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml b/spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml
rename to spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/config/TransactionManagerConfiguration.java b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionManagerConfiguration.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/config/TransactionManagerConfiguration.java
rename to spring-tx/src/test/java/org/springframework/transaction/config/TransactionManagerConfiguration.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/config/TransactionalService.java b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/config/TransactionalService.java
rename to spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml b/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml
rename to spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml b/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
rename to spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml b/spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/transactionalBeanFactory.xml b/spring-tx/src/test/java/org/springframework/transaction/interceptor/transactionalBeanFactory.xml
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/interceptor/transactionalBeanFactory.xml
rename to spring-tx/src/test/java/org/springframework/transaction/interceptor/transactionalBeanFactory.xml
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/jta/MockUOWManager.java b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
rename to spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
rename to spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml b/spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml
rename to spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml
diff --git a/org.springframework.transaction/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-tx/src/test/java/org/springframework/util/SerializationTestUtils.java
similarity index 100%
rename from org.springframework.transaction/src/test/java/org/springframework/util/SerializationTestUtils.java
rename to spring-tx/src/test/java/org/springframework/util/SerializationTestUtils.java
diff --git a/org.springframework.transaction/src/test/resources/log4j.xml b/spring-tx/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.transaction/src/test/resources/log4j.xml
rename to spring-tx/src/test/resources/log4j.xml
diff --git a/org.springframework.transaction/template.mf b/spring-tx/template.mf
similarity index 100%
rename from org.springframework.transaction/template.mf
rename to spring-tx/template.mf
diff --git a/org.springframework.web/src/main/java/org/springframework/http/HttpEntity.java b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/HttpEntity.java
rename to spring-web/src/main/java/org/springframework/http/HttpEntity.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/HttpHeaders.java
rename to spring-web/src/main/java/org/springframework/http/HttpHeaders.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/HttpInputMessage.java b/spring-web/src/main/java/org/springframework/http/HttpInputMessage.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/HttpInputMessage.java
rename to spring-web/src/main/java/org/springframework/http/HttpInputMessage.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/HttpMessage.java b/spring-web/src/main/java/org/springframework/http/HttpMessage.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/HttpMessage.java
rename to spring-web/src/main/java/org/springframework/http/HttpMessage.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/HttpMethod.java b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/HttpMethod.java
rename to spring-web/src/main/java/org/springframework/http/HttpMethod.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/HttpOutputMessage.java b/spring-web/src/main/java/org/springframework/http/HttpOutputMessage.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/HttpOutputMessage.java
rename to spring-web/src/main/java/org/springframework/http/HttpOutputMessage.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/HttpRequest.java b/spring-web/src/main/java/org/springframework/http/HttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/HttpRequest.java
rename to spring-web/src/main/java/org/springframework/http/HttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/HttpStatus.java b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/HttpStatus.java
rename to spring-web/src/main/java/org/springframework/http/HttpStatus.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/MediaType.java
rename to spring-web/src/main/java/org/springframework/http/MediaType.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/MediaTypeEditor.java b/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/MediaTypeEditor.java
rename to spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/ResponseEntity.java b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/ResponseEntity.java
rename to spring-web/src/main/java/org/springframework/http/ResponseEntity.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/AbstractBufferingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/AbstractBufferingClientHttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/AbstractBufferingClientHttpRequest.java
rename to spring-web/src/main/java/org/springframework/http/client/AbstractBufferingClientHttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/AbstractClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/AbstractClientHttpRequest.java
rename to spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java
rename to spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java
rename to spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestFactory.java
rename to spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
rename to spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/BufferingClientHttpResponseWrapper.java b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpResponseWrapper.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/BufferingClientHttpResponseWrapper.java
rename to spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpResponseWrapper.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/ClientHttpRequest.java
rename to spring-web/src/main/java/org/springframework/http/client/ClientHttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/ClientHttpRequestExecution.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestExecution.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/ClientHttpRequestExecution.java
rename to spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestExecution.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/ClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/ClientHttpRequestFactory.java
rename to spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
rename to spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/ClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/ClientHttpResponse.java
rename to spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java
rename to spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
rename to spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/CommonsClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpResponse.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/CommonsClientHttpResponse.java
rename to spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpResponse.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
rename to spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
rename to spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java
rename to spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
rename to spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java
rename to spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
rename to spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
rename to spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java
rename to spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java
rename to spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/package-info.java b/spring-web/src/main/java/org/springframework/http/client/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/package-info.java
rename to spring-web/src/main/java/org/springframework/http/client/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/support/HttpAccessor.java b/spring-web/src/main/java/org/springframework/http/client/support/HttpAccessor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/support/HttpAccessor.java
rename to spring-web/src/main/java/org/springframework/http/client/support/HttpAccessor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java b/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
rename to spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/support/InterceptingHttpAccessor.java b/spring-web/src/main/java/org/springframework/http/client/support/InterceptingHttpAccessor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/support/InterceptingHttpAccessor.java
rename to spring-web/src/main/java/org/springframework/http/client/support/InterceptingHttpAccessor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/support/ProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/http/client/support/ProxyFactoryBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/support/ProxyFactoryBean.java
rename to spring-web/src/main/java/org/springframework/http/client/support/ProxyFactoryBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/client/support/package-info.java b/spring-web/src/main/java/org/springframework/http/client/support/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/client/support/package-info.java
rename to spring-web/src/main/java/org/springframework/http/client/support/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java
rename to spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/HttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/HttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java
rename to spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java
rename to spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/feed/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/feed/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/feed/package-info.java
rename to spring-web/src/main/java/org/springframework/http/converter/feed/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/json/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/json/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/json/package-info.java
rename to spring-web/src/main/java/org/springframework/http/converter/json/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/package-info.java
rename to spring-web/src/main/java/org/springframework/http/converter/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/xml/AbstractXmlHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractXmlHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/xml/AbstractXmlHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/xml/AbstractXmlHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java
rename to spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/xml/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/xml/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/converter/xml/package-info.java
rename to spring-web/src/main/java/org/springframework/http/converter/xml/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/package-info.java b/spring-web/src/main/java/org/springframework/http/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/package-info.java
rename to spring-web/src/main/java/org/springframework/http/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/server/ServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServerHttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/server/ServerHttpRequest.java
rename to spring-web/src/main/java/org/springframework/http/server/ServerHttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/server/ServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/ServerHttpResponse.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/server/ServerHttpResponse.java
rename to spring-web/src/main/java/org/springframework/http/server/ServerHttpResponse.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
rename to spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
rename to spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
diff --git a/org.springframework.web/src/main/java/org/springframework/http/server/package-info.java b/spring-web/src/main/java/org/springframework/http/server/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/http/server/package-info.java
rename to spring-web/src/main/java/org/springframework/http/server/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
rename to spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
rename to spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
rename to spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
rename to spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
rename to spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
rename to spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
rename to spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
rename to spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
rename to spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
rename to spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/package-info.java b/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/caucho/package-info.java
rename to spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
rename to spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java
rename to spring-web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
rename to spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
rename to spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java
rename to spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java
rename to spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerRequestExecutor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerRequestExecutor.java
rename to spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerRequestExecutor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
rename to spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java
rename to spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
rename to spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
rename to spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcServicePostProcessor.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcServicePostProcessor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcServicePostProcessor.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcServicePostProcessor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/package-info.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/package-info.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxrpc/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/package-info.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/remoting/jaxws/package-info.java
rename to spring-web/src/main/java/org/springframework/remoting/jaxws/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/HttpMediaTypeException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/HttpMediaTypeException.java
rename to spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java
rename to spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java
rename to spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/HttpRequestHandler.java b/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/HttpRequestHandler.java
rename to spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
rename to spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/HttpSessionRequiredException.java b/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
rename to spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
rename to spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/WebApplicationInitializer.java b/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/WebApplicationInitializer.java
rename to spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/EscapedErrors.java b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/EscapedErrors.java
rename to spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
rename to spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java
rename to spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java
rename to spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
rename to spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
rename to spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
rename to spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
rename to spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/WebDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/WebDataBinder.java
rename to spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/Mapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/Mapping.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/Mapping.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/Mapping.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/ModelAttribute.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ModelAttribute.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/ModelAttribute.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/ModelAttribute.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/PathVariable.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/PathVariable.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/PathVariable.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/PathVariable.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/ResponseBody.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseBody.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/ResponseBody.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseBody.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/package-info.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/package-info.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/annotation/support/package-info.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/annotation/support/package-info.java
rename to spring-web/src/main/java/org/springframework/web/bind/annotation/support/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/package-info.java b/spring-web/src/main/java/org/springframework/web/bind/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/package-info.java
rename to spring-web/src/main/java/org/springframework/web/bind/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java b/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
rename to spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
rename to spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java
rename to spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java b/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java
rename to spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/support/SessionStatus.java b/spring-web/src/main/java/org/springframework/web/bind/support/SessionStatus.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/support/SessionStatus.java
rename to spring-web/src/main/java/org/springframework/web/bind/support/SessionStatus.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java b/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
rename to spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java
rename to spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/support/WebBindingInitializer.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebBindingInitializer.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/support/WebBindingInitializer.java
rename to spring-web/src/main/java/org/springframework/web/bind/support/WebBindingInitializer.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java
rename to spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
rename to spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/bind/support/package-info.java b/spring-web/src/main/java/org/springframework/web/bind/support/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/bind/support/package-info.java
rename to spring-web/src/main/java/org/springframework/web/bind/support/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
rename to spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/HttpClientErrorException.java b/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/HttpClientErrorException.java
rename to spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
rename to spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/HttpServerErrorException.java b/spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/HttpServerErrorException.java
rename to spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java b/spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java
rename to spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/RequestCallback.java b/spring-web/src/main/java/org/springframework/web/client/RequestCallback.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/RequestCallback.java
rename to spring-web/src/main/java/org/springframework/web/client/RequestCallback.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/ResourceAccessException.java b/spring-web/src/main/java/org/springframework/web/client/ResourceAccessException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/ResourceAccessException.java
rename to spring-web/src/main/java/org/springframework/web/client/ResourceAccessException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java
rename to spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/ResponseExtractor.java b/spring-web/src/main/java/org/springframework/web/client/ResponseExtractor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/ResponseExtractor.java
rename to spring-web/src/main/java/org/springframework/web/client/ResponseExtractor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/RestClientException.java b/spring-web/src/main/java/org/springframework/web/client/RestClientException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/RestClientException.java
rename to spring-web/src/main/java/org/springframework/web/client/RestClientException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/RestOperations.java b/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/RestOperations.java
rename to spring-web/src/main/java/org/springframework/web/client/RestOperations.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java
rename to spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/package-info.java b/spring-web/src/main/java/org/springframework/web/client/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/package-info.java
rename to spring-web/src/main/java/org/springframework/web/client/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/support/RestGatewaySupport.java b/spring-web/src/main/java/org/springframework/web/client/support/RestGatewaySupport.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/support/RestGatewaySupport.java
rename to spring-web/src/main/java/org/springframework/web/client/support/RestGatewaySupport.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/support/package-info.java b/spring-web/src/main/java/org/springframework/web/client/support/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/client/support/package-info.java
rename to spring-web/src/main/java/org/springframework/web/client/support/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
rename to spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/ContextCleanupListener.java b/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
rename to spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/ContextLoader.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/ContextLoader.java
rename to spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/ContextLoader.properties b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.properties
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/ContextLoader.properties
rename to spring-web/src/main/java/org/springframework/web/context/ContextLoader.properties
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/ContextLoaderListener.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
rename to spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/ServletConfigAware.java b/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/ServletConfigAware.java
rename to spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/ServletContextAware.java b/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/ServletContextAware.java
rename to spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/WebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/WebApplicationContext.java
rename to spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/package-info.java b/spring-web/src/main/java/org/springframework/web/context/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/package-info.java
rename to spring-web/src/main/java/org/springframework/web/context/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributes.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributes.java
rename to spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributes.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
rename to spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
rename to spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
rename to spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
rename to spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java b/spring-web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java
rename to spring-web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
rename to spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/RequestAttributes.java
rename to spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
rename to spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestContextListener.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/RequestContextListener.java
rename to spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestScope.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/RequestScope.java
rename to spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java
rename to spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
rename to spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/SessionScope.java b/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/SessionScope.java
rename to spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/WebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/WebRequest.java
rename to spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java b/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java
rename to spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/package-info.java b/spring-web/src/main/java/org/springframework/web/context/request/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/request/package-info.java
rename to spring-web/src/main/java/org/springframework/web/context/request/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java
rename to spring-web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
rename to spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
rename to spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
rename to spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
rename to spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextScope.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java
rename to spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java b/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
rename to spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java b/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
rename to spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java
rename to spring-web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java
rename to spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java
rename to spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java
rename to spring-web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/package-info.java b/spring-web/src/main/java/org/springframework/web/context/support/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/context/support/package-info.java
rename to spring-web/src/main/java/org/springframework/web/context/support/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
rename to spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java
rename to spring-web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java
rename to spring-web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/CompositeFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/CompositeFilter.java
rename to spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java b/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
rename to spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/GenericFilterBean.java b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
rename to spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
rename to spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
rename to spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/Log4jNestedDiagnosticContextFilter.java b/spring-web/src/main/java/org/springframework/web/filter/Log4jNestedDiagnosticContextFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/Log4jNestedDiagnosticContextFilter.java
rename to spring-web/src/main/java/org/springframework/web/filter/Log4jNestedDiagnosticContextFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
rename to spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/RequestContextFilter.java b/spring-web/src/main/java/org/springframework/web/filter/RequestContextFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/RequestContextFilter.java
rename to spring-web/src/main/java/org/springframework/web/filter/RequestContextFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java
rename to spring-web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
rename to spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/package-info.java b/spring-web/src/main/java/org/springframework/web/filter/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/filter/package-info.java
rename to spring-web/src/main/java/org/springframework/web/filter/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java b/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
rename to spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
rename to spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
rename to spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java
rename to spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java b/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java
rename to spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java
rename to spring-web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java
rename to spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
rename to spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
rename to spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/el/package-info.java b/spring-web/src/main/java/org/springframework/web/jsf/el/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/jsf/el/package-info.java
rename to spring-web/src/main/java/org/springframework/web/jsf/el/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/package-info.java b/spring-web/src/main/java/org/springframework/web/jsf/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/jsf/package-info.java
rename to spring-web/src/main/java/org/springframework/web/jsf/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/HandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/HandlerMethod.java
rename to spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java
rename to spring-web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractWebArgumentResolverAdapter.java b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractWebArgumentResolverAdapter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractWebArgumentResolverAdapter.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/AbstractWebArgumentResolverAdapter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ErrorsMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ErrorsMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/ErrorsMethodArgumentResolver.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/ErrorsMethodArgumentResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java b/spring-web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolver.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/SessionAttributesHandler.java b/spring-web/src/main/java/org/springframework/web/method/annotation/SessionAttributesHandler.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/SessionAttributesHandler.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/SessionAttributesHandler.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/SessionStatusMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/SessionStatusMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/SessionStatusMethodArgumentResolver.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/SessionStatusMethodArgumentResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/package-info.java b/spring-web/src/main/java/org/springframework/web/method/annotation/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/package-info.java
rename to spring-web/src/main/java/org/springframework/web/method/annotation/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/package-info.java b/spring-web/src/main/java/org/springframework/web/method/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/package-info.java
rename to spring-web/src/main/java/org/springframework/web/method/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java
rename to spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
rename to spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java
rename to spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerComposite.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerComposite.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerComposite.java
rename to spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerComposite.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
rename to spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java b/spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java
rename to spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/support/package-info.java b/spring-web/src/main/java/org/springframework/web/method/support/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/method/support/package-info.java
rename to spring-web/src/main/java/org/springframework/web/method/support/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java b/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java
rename to spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartException.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartException.java
rename to spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartFile.java
rename to spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
rename to spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartRequest.java
rename to spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
rename to spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
rename to spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java
rename to spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
rename to spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/commons/package-info.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/commons/package-info.java
rename to spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/package-info.java b/spring-web/src/main/java/org/springframework/web/multipart/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/package-info.java
rename to spring-web/src/main/java/org/springframework/web/multipart/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
rename to spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java b/spring-web/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java
rename to spring-web/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
rename to spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java b/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
rename to spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
rename to spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
rename to spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
rename to spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
rename to spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
rename to spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/package-info.java b/spring-web/src/main/java/org/springframework/web/multipart/support/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/multipart/support/package-info.java
rename to spring-web/src/main/java/org/springframework/web/multipart/support/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/package-info.java b/spring-web/src/main/java/org/springframework/web/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/package-info.java
rename to spring-web/src/main/java/org/springframework/web/package-info.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/CookieGenerator.java b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/CookieGenerator.java
rename to spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java b/spring-web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java
rename to spring-web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
rename to spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
rename to spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/HtmlUtils.java b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/HtmlUtils.java
rename to spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
rename to spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java b/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
rename to spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/JavaScriptUtils.java b/spring-web/src/main/java/org/springframework/web/util/JavaScriptUtils.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/JavaScriptUtils.java
rename to spring-web/src/main/java/org/springframework/web/util/JavaScriptUtils.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/Log4jConfigListener.java b/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
rename to spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java b/spring-web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java
rename to spring-web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/NestedServletException.java b/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/NestedServletException.java
rename to spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/TagUtils.java b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/TagUtils.java
rename to spring-web/src/main/java/org/springframework/web/util/TagUtils.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/UriComponents.java b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/UriComponents.java
rename to spring-web/src/main/java/org/springframework/web/util/UriComponents.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
rename to spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/UriTemplate.java
rename to spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/UriUtils.java b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/UriUtils.java
rename to spring-web/src/main/java/org/springframework/web/util/UriUtils.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java
rename to spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/WebAppRootListener.java b/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/WebAppRootListener.java
rename to spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/WebUtils.java b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/WebUtils.java
rename to spring-web/src/main/java/org/springframework/web/util/WebUtils.java
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/package-info.java b/spring-web/src/main/java/org/springframework/web/util/package-info.java
similarity index 100%
rename from org.springframework.web/src/main/java/org/springframework/web/util/package-info.java
rename to spring-web/src/main/java/org/springframework/web/util/package-info.java
diff --git a/org.springframework.web/src/main/java/overview.html b/spring-web/src/main/java/overview.html
similarity index 100%
rename from org.springframework.web/src/main/java/overview.html
rename to spring-web/src/main/java/overview.html
diff --git a/org.springframework.web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/spring-web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
similarity index 100%
rename from org.springframework.web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
rename to spring-web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
diff --git a/org.springframework.web/src/main/resources/org/springframework/web/util/HtmlCharacterEntityReferences.properties b/spring-web/src/main/resources/org/springframework/web/util/HtmlCharacterEntityReferences.properties
similarity index 100%
rename from org.springframework.web/src/main/resources/org/springframework/web/util/HtmlCharacterEntityReferences.properties
rename to spring-web/src/main/resources/org/springframework/web/util/HtmlCharacterEntityReferences.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/BeanWithObjectProperty.java b/spring-web/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
rename to spring-web/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/Colour.java b/spring-web/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/Colour.java
rename to spring-web/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
rename to spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/FieldAccessBean.java b/spring-web/src/test/java/org/springframework/beans/FieldAccessBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/FieldAccessBean.java
rename to spring-web/src/test/java/org/springframework/beans/FieldAccessBean.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-web/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/IOther.java b/spring-web/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/IOther.java
rename to spring-web/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/ITestBean.java b/spring-web/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-web/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-web/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-web/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/Person.java b/spring-web/src/test/java/org/springframework/beans/Person.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/Person.java
rename to spring-web/src/test/java/org/springframework/beans/Person.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/SerializablePerson.java
rename to spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/TestBean.java b/spring-web/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/TestBean.java
rename to spring-web/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
rename to spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java
diff --git a/org.springframework.web/src/test/java/org/springframework/core/task/MockRunnable.java b/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/core/task/MockRunnable.java
rename to spring-web/src/test/java/org/springframework/core/task/MockRunnable.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/HttpEntityTests.java b/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/HttpEntityTests.java
rename to spring-web/src/test/java/org/springframework/http/HttpEntityTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/HttpHeadersTests.java b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/HttpHeadersTests.java
rename to spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/HttpStatusTests.java b/spring-web/src/test/java/org/springframework/http/HttpStatusTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/HttpStatusTests.java
rename to spring-web/src/test/java/org/springframework/http/HttpStatusTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/MediaTypeTests.java b/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/MediaTypeTests.java
rename to spring-web/src/test/java/org/springframework/http/MediaTypeTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/MockHttpInputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/MockHttpInputMessage.java
rename to spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/MockHttpOutputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
rename to spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java
rename to spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java
rename to spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/client/BufferingClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/BufferingClientHttpRequestFactoryTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/client/BufferingClientHttpRequestFactoryTests.java
rename to spring-web/src/test/java/org/springframework/http/client/BufferingClientHttpRequestFactoryTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/client/CommonsHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/CommonsHttpRequestFactoryTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/client/CommonsHttpRequestFactoryTests.java
rename to spring-web/src/test/java/org/springframework/http/client/CommonsHttpRequestFactoryTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/http/client/FreePortScanner.java
rename to spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java
rename to spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
rename to spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java
rename to spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/client/support/ProxyFactoryBeanTest.java b/spring-web/src/test/java/org/springframework/http/client/support/ProxyFactoryBeanTest.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/client/support/ProxyFactoryBeanTest.java
rename to spring-web/src/test/java/org/springframework/http/client/support/ProxyFactoryBeanTest.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/BufferedImageHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/BufferedImageHttpMessageConverterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/BufferedImageHttpMessageConverterTests.java
rename to spring-web/src/test/java/org/springframework/http/converter/BufferedImageHttpMessageConverterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/ByteArrayHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ByteArrayHttpMessageConverterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/ByteArrayHttpMessageConverterTests.java
rename to spring-web/src/test/java/org/springframework/http/converter/ByteArrayHttpMessageConverterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
rename to spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
rename to spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
rename to spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
rename to spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java
rename to spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
rename to spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java
rename to spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java
rename to spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java
rename to spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
rename to spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
rename to spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java
rename to spring-web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-web/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
rename to spring-web/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-web/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
rename to spring-web/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-web/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
rename to spring-web/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockExpressionEvaluator.java b/spring-web/src/test/java/org/springframework/mock/web/MockExpressionEvaluator.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockExpressionEvaluator.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockExpressionEvaluator.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockFilterChain.java b/spring-web/src/test/java/org/springframework/mock/web/MockFilterChain.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockFilterChain.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockFilterChain.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockFilterConfig.java b/spring-web/src/test/java/org/springframework/mock/web/MockFilterConfig.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockFilterConfig.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockFilterConfig.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-web/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-web/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-web/src/test/java/org/springframework/mock/web/MockHttpSession.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockHttpSession.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockJspWriter.java b/spring-web/src/test/java/org/springframework/mock/web/MockJspWriter.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockJspWriter.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockJspWriter.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/spring-web/src/test/java/org/springframework/mock/web/MockMultipartFile.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockMultipartFile.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java b/spring-web/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockPageContext.java b/spring-web/src/test/java/org/springframework/mock/web/MockPageContext.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockPageContext.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockPageContext.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockPart.java b/spring-web/src/test/java/org/springframework/mock/web/MockPart.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockPart.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockPart.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-web/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockServletConfig.java b/spring-web/src/test/java/org/springframework/mock/web/MockServletConfig.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockServletConfig.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockServletConfig.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockServletContext.java b/spring-web/src/test/java/org/springframework/mock/web/MockServletContext.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockServletContext.java
rename to spring-web/src/test/java/org/springframework/mock/web/MockServletContext.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-web/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
rename to spring-web/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
diff --git a/org.springframework.web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
rename to spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
rename to spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java b/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
rename to spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
rename to spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
rename to spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
diff --git a/org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderService.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderService.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderService.java
rename to spring-web/src/test/java/org/springframework/remoting/jaxws/OrderService.java
diff --git a/org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
rename to spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
diff --git a/org.springframework.web/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-web/src/test/java/org/springframework/util/SerializationTestUtils.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/util/SerializationTestUtils.java
rename to spring-web/src/test/java/org/springframework/util/SerializationTestUtils.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java b/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java
rename to spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
rename to spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
rename to spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
rename to spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java b/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java
rename to spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
rename to spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateTests.java
rename to spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
rename to spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java
rename to spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
rename to spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java
rename to spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java b/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
rename to spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java b/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
rename to spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
rename to spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java
rename to spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContextTests.java b/spring-web/src/test/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContextTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContextTests.java
rename to spring-web/src/test/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContextTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/support/ResourceTests.java b/spring-web/src/test/java/org/springframework/web/context/support/ResourceTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/support/ResourceTests.java
rename to spring-web/src/test/java/org/springframework/web/context/support/ResourceTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/support/Spr8510Tests.java b/spring-web/src/test/java/org/springframework/web/context/support/Spr8510Tests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/support/Spr8510Tests.java
rename to spring-web/src/test/java/org/springframework/web/context/support/Spr8510Tests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java b/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java
rename to spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/context/support/StandardServletEnvironmentTests.java b/spring-web/src/test/java/org/springframework/web/context/support/StandardServletEnvironmentTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/context/support/StandardServletEnvironmentTests.java
rename to spring-web/src/test/java/org/springframework/web/context/support/StandardServletEnvironmentTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java
rename to spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
rename to spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
rename to spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java
rename to spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/filter/HttpPutFormContentFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/HttpPutFormContentFilterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/filter/HttpPutFormContentFilterTests.java
rename to spring-web/src/test/java/org/springframework/web/filter/HttpPutFormContentFilterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
rename to spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java
rename to spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java
rename to spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/jsf/DelegatingNavigationHandlerTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingNavigationHandlerTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/jsf/DelegatingNavigationHandlerTests.java
rename to spring-web/src/test/java/org/springframework/web/jsf/DelegatingNavigationHandlerTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
rename to spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
rename to spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/jsf/MockFacesContext.java b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
rename to spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/jsf/MockLifecycle.java b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
rename to spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ErrorsMethodHandlerArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ErrorsMethodHandlerArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/ErrorsMethodHandlerArgumentResolverTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/ErrorsMethodHandlerArgumentResolverTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java
rename to spring-web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java
rename to spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java
rename to spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java b/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java
rename to spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java b/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java
rename to spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
rename to spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
rename to spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
rename to spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java b/spring-web/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java
rename to spring-web/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
rename to spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java
rename to spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java b/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java
rename to spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
rename to spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/Log4jWebConfigurerTests.java b/spring-web/src/test/java/org/springframework/web/util/Log4jWebConfigurerTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/Log4jWebConfigurerTests.java
rename to spring-web/src/test/java/org/springframework/web/util/Log4jWebConfigurerTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/MockLog4jAppender.java b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
rename to spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/TagUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/TagUtilsTests.java
rename to spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
rename to spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/UriComponentsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/UriComponentsTests.java
rename to spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/UriTemplateTests.java b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/UriTemplateTests.java
rename to spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/UriUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/UriUtilsTests.java
rename to spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
rename to spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/WebUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/web/util/WebUtilsTests.java
rename to spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
diff --git a/org.springframework.web.struts/src/test/resources/log4j.xml b/spring-web/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.web.struts/src/test/resources/log4j.xml
rename to spring-web/src/test/resources/log4j.xml
diff --git a/org.springframework.web/src/test/resources/org/springframework/http/converter/feed/atom.xml b/spring-web/src/test/resources/org/springframework/http/converter/feed/atom.xml
similarity index 100%
rename from org.springframework.web/src/test/resources/org/springframework/http/converter/feed/atom.xml
rename to spring-web/src/test/resources/org/springframework/http/converter/feed/atom.xml
diff --git a/org.springframework.web/src/test/resources/org/springframework/http/converter/feed/rss.xml b/spring-web/src/test/resources/org/springframework/http/converter/feed/rss.xml
similarity index 100%
rename from org.springframework.web/src/test/resources/org/springframework/http/converter/feed/rss.xml
rename to spring-web/src/test/resources/org/springframework/http/converter/feed/rss.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/mvc/method/annotation/logo.jpg b/spring-web/src/test/resources/org/springframework/http/converter/logo.jpg
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/mvc/method/annotation/logo.jpg
rename to spring-web/src/test/resources/org/springframework/http/converter/logo.jpg
diff --git a/org.springframework.web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml b/spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml
similarity index 100%
rename from org.springframework.web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml
rename to spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml
diff --git a/org.springframework.web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml b/spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml
similarity index 100%
rename from org.springframework.web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml
rename to spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml
diff --git a/org.springframework.web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml b/spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml
similarity index 100%
rename from org.springframework.web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml
rename to spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml
diff --git a/org.springframework.web/src/test/resources/org/springframework/web/util/HtmlCharacterEntityReferences.dtd b/spring-web/src/test/resources/org/springframework/web/util/HtmlCharacterEntityReferences.dtd
similarity index 100%
rename from org.springframework.web/src/test/resources/org/springframework/web/util/HtmlCharacterEntityReferences.dtd
rename to spring-web/src/test/resources/org/springframework/web/util/HtmlCharacterEntityReferences.dtd
diff --git a/org.springframework.web/src/test/resources/org/springframework/web/util/testlog4j.properties b/spring-web/src/test/resources/org/springframework/web/util/testlog4j.properties
similarity index 100%
rename from org.springframework.web/src/test/resources/org/springframework/web/util/testlog4j.properties
rename to spring-web/src/test/resources/org/springframework/web/util/testlog4j.properties
diff --git a/org.springframework.web/template.mf b/spring-web/template.mf
similarity index 100%
rename from org.springframework.web/template.mf
rename to spring-web/template.mf
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.properties b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.properties
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.properties
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.properties
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/EventMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/EventMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/EventMapping.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/EventMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/RenderMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/RenderMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/RenderMapping.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/RenderMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ResourceMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ResourceMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ResourceMapping.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ResourceMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/package-info.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/package-info.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/package-info.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/package-info.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/package-info.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/package-info.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/package-info.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/package-info.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigPropertySource.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigPropertySource.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigPropertySource.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigPropertySource.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextPropertySource.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextPropertySource.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextPropertySource.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextPropertySource.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourceLoader.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourceLoader.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourceLoader.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourceLoader.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/StandardPortletEnvironment.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StandardPortletEnvironment.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/StandardPortletEnvironment.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StandardPortletEnvironment.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/XmlPortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/XmlPortletApplicationContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/XmlPortletApplicationContext.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/XmlPortletApplicationContext.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/package-info.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/package-info.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/package-info.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/package-info.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterLookupKey.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterLookupKey.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterLookupKey.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterLookupKey.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptor.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptor.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptor.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/package-info.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/package-info.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/package-info.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/package-info.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/MultipartActionRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/MultipartActionRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/MultipartActionRequest.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/MultipartActionRequest.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/package-info.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/package-info.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/package-info.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/package-info.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/EventAwareController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/EventAwareController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/EventAwareController.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/EventAwareController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationMappingUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationMappingUtils.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationMappingUtils.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationMappingUtils.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/package-info.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/package-info.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/package-info.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/package-info.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/package-info.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/package-info.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/package-info.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/package-info.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/package-info.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/package-info.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/package-info.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/package-info.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/package-info.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/package-info.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/package-info.java
rename to spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/package-info.java
diff --git a/org.springframework.web.portlet/src/main/java/overview.html b/spring-webmvc-portlet/src/main/java/overview.html
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/overview.html
rename to spring-webmvc-portlet/src/main/java/overview.html
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/Colour.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/DerivedTestBean.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/IOther.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/IOther.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/ITestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/TestBean.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/context/ACATester.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/context/BeanThatListens.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/context/TestListener.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/context/TestListener.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/MockServletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/MockServletContext.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockActionRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockActionRequest.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionRequest.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletPreferences.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/package-info.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/package-info.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/package-info.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/package-info.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletApplicationContextScopeTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletApplicationContextScopeTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletApplicationContextScopeTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletApplicationContextScopeTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletRequestAttributesTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletRequestAttributesTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletRequestAttributesTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletRequestAttributesTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/context-messages.properties b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/context-messages.properties
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_GB.properties b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_GB.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_GB.properties
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_GB.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_US.properties b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_US.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_US.properties
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_US.properties
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/contextInclude.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/contextInclude.xml
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/contextInclude.xml
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/contextInclude.xml
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/more-context-messages.properties b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/more-context-messages.properties
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/more-context-messages.properties
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/more-context-messages.properties
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myoverride.properties b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myoverride.properties
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myoverride.properties
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myoverride.properties
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myplaceholder.properties b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myplaceholder.properties
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myplaceholder.properties
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myplaceholder.properties
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/parameterMapping.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/parameterMapping.xml
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/parameterMapping.xml
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/parameterMapping.xml
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/portletModeMapping.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeMapping.xml
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/portletModeMapping.xml
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeMapping.xml
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/portletModeParameterMapping.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeParameterMapping.xml
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/handler/portletModeParameterMapping.xml
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeParameterMapping.xml
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
similarity index 100%
rename from org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
rename to spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
diff --git a/org.springframework.web/src/test/resources/log4j.xml b/spring-webmvc-portlet/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.web/src/test/resources/log4j.xml
rename to spring-webmvc-portlet/src/test/resources/log4j.xml
diff --git a/org.springframework.web.portlet/template.mf b/spring-webmvc-portlet/template.mf
similarity index 100%
rename from org.springframework.web.portlet/template.mf
rename to spring-webmvc-portlet/template.mf
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.properties b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.properties
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.properties
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.properties
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FlashMap.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMap.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FlashMap.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMap.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FlashMapManager.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMapManager.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FlashMapManager.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMapManager.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HttpServletBean.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HttpServletBean.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/LocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/LocaleResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ModelAndView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ModelAndView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ResourceServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ResourceServlet.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/SmartView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/SmartView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ThemeResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/View.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/View.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/InterceptorRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/InterceptorRegistration.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/InterceptorRegistration.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/InterceptorRegistration.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/InterceptorRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/InterceptorRegistry.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/InterceptorRegistry.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/InterceptorRegistry.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/handler/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/AbstractLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AbstractLocaleResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/AbstractLocaleResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AbstractLocaleResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/Controller.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/Controller.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/LastModified.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RedirectAttributesMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RedirectAttributesMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RedirectAttributesMethodArgumentResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RedirectAttributesMethodArgumentResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestDataBinderFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestDataBinderFactory.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestDataBinderFactory.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestDataBinderFactory.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerTypePredicate.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerTypePredicate.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerTypePredicate.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerTypePredicate.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/resource/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/resource/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/resource/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/BindStatus.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/BindStatus.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/DefaultFlashMapManager.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/DefaultFlashMapManager.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/DefaultFlashMapManager.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/support/DefaultFlashMapManager.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JstlUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JstlUtils.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/support/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EvalTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/MessageTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/Param.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/Param.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/ParamAware.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/ParamAware.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/ParamTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/TransformTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/tags/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/theme/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/AbstractView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/AbstractView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/JstlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/JstlView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfStamperView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfStamperView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfStamperView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfStamperView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/document/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/document/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/feed/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/feed/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfig.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfig.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfig.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfig.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/json/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/json/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xml/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xml/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/package-info.java
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/package-info.java
rename to spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/package-info.java
diff --git a/org.springframework.web.servlet/src/main/java/overview.html b/spring-webmvc/src/main/java/overview.html
similarity index 100%
rename from org.springframework.web.servlet/src/main/java/overview.html
rename to spring-webmvc/src/main/java/overview.html
diff --git a/org.springframework.web.servlet/src/main/resources/META-INF/spring-form.tld b/spring-webmvc/src/main/resources/META-INF/spring-form.tld
similarity index 100%
rename from org.springframework.web.servlet/src/main/resources/META-INF/spring-form.tld
rename to spring-webmvc/src/main/resources/META-INF/spring-form.tld
diff --git a/org.springframework.web.servlet/src/main/resources/META-INF/spring.handlers b/spring-webmvc/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from org.springframework.web.servlet/src/main/resources/META-INF/spring.handlers
rename to spring-webmvc/src/main/resources/META-INF/spring.handlers
diff --git a/org.springframework.web.servlet/src/main/resources/META-INF/spring.schemas b/spring-webmvc/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from org.springframework.web.servlet/src/main/resources/META-INF/spring.schemas
rename to spring-webmvc/src/main/resources/META-INF/spring.schemas
diff --git a/org.springframework.web.servlet/src/main/resources/META-INF/spring.tld b/spring-webmvc/src/main/resources/META-INF/spring.tld
similarity index 100%
rename from org.springframework.web.servlet/src/main/resources/META-INF/spring.tld
rename to spring-webmvc/src/main/resources/META-INF/spring.tld
diff --git a/org.springframework.web.servlet/src/main/resources/META-INF/spring.tooling b/spring-webmvc/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from org.springframework.web.servlet/src/main/resources/META-INF/spring.tooling
rename to spring-webmvc/src/main/resources/META-INF/spring.tooling
diff --git a/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
similarity index 100%
rename from org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
rename to spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
diff --git a/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd
similarity index 100%
rename from org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd
rename to spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd
diff --git a/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc.gif b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.gif
similarity index 100%
rename from org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc.gif
rename to spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.gif
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/BeanWithObjectProperty.java b/spring-webmvc/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
rename to spring-webmvc/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc/src/test/java/org/springframework/beans/Colour.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/Colour.java
rename to spring-webmvc/src/test/java/org/springframework/beans/Colour.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/CustomEnum.java b/spring-webmvc/src/test/java/org/springframework/beans/CustomEnum.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/CustomEnum.java
rename to spring-webmvc/src/test/java/org/springframework/beans/CustomEnum.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/DerivedTestBean.java
rename to spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/FieldAccessBean.java b/spring-webmvc/src/test/java/org/springframework/beans/FieldAccessBean.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/FieldAccessBean.java
rename to spring-webmvc/src/test/java/org/springframework/beans/FieldAccessBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/GenericBean.java b/spring-webmvc/src/test/java/org/springframework/beans/GenericBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/GenericBean.java
rename to spring-webmvc/src/test/java/org/springframework/beans/GenericBean.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/IOther.java b/spring-webmvc/src/test/java/org/springframework/beans/IOther.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/IOther.java
rename to spring-webmvc/src/test/java/org/springframework/beans/IOther.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/ITestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/ITestBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-webmvc/src/test/java/org/springframework/beans/ITestBean.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/IndexedTestBean.java
rename to spring-webmvc/src/test/java/org/springframework/beans/IndexedTestBean.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/NestedTestBean.java
rename to spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/Person.java b/spring-webmvc/src/test/java/org/springframework/beans/Person.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/Person.java
rename to spring-webmvc/src/test/java/org/springframework/beans/Person.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/Pet.java b/spring-webmvc/src/test/java/org/springframework/beans/Pet.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/Pet.java
rename to spring-webmvc/src/test/java/org/springframework/beans/Pet.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/SerializablePerson.java
rename to spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/TestBean.java
rename to spring-webmvc/src/test/java/org/springframework/beans/TestBean.java
diff --git a/org.springframework.web/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/beans/factory/DummyFactory.java
rename to spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
rename to spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
rename to spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/beans/factory/access/TestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/beans/factory/access/TestBean.java
rename to spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/context/ACATester.java
rename to spring-webmvc/src/test/java/org/springframework/context/ACATester.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java
rename to spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/context/BeanThatListens.java
rename to spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/context/LifecycleContextBean.java
rename to spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/context/TestListener.java b/spring-webmvc/src/test/java/org/springframework/context/TestListener.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/context/TestListener.java
rename to spring-webmvc/src/test/java/org/springframework/context/TestListener.java
diff --git a/org.springframework.web/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/http/client/FreePortScanner.java
rename to spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-webmvc/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-webmvc/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-webmvc/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockBodyContent.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockBodyContent.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockBodyContent.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockBodyContent.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockFilterChain.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockFilterChain.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockFilterChain.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockFilterChain.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockFilterConfig.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockFilterConfig.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockFilterConfig.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockFilterConfig.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockHttpSession.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpSession.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockHttpSession.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockJspWriter.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockJspWriter.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockJspWriter.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockJspWriter.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockMultipartFile.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockMultipartFile.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockMultipartFile.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockPageContext.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockPageContext.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockPageContext.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockPageContext.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockPart.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockPart.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockPart.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockPart.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockServletConfig.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockServletConfig.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/MockServletConfig.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockServletConfig.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockServletContext.java b/spring-webmvc/src/test/java/org/springframework/mock/web/MockServletContext.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockServletContext.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/MockServletContext.java
diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-webmvc/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
similarity index 100%
rename from org.springframework.web/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
rename to spring-webmvc/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/ui/jasperreports/PersonBean.java b/spring-webmvc/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
rename to spring-webmvc/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/ui/jasperreports/ProductBean.java b/spring-webmvc/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
rename to spring-webmvc/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-webmvc/src/test/java/org/springframework/util/SerializationTestUtils.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/util/SerializationTestUtils.java
rename to spring-webmvc/src/test/java/org/springframework/util/SerializationTestUtils.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/ContextLoaderTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/ServletContextAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/ServletContextAwareProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareProcessorTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/ServletContextAwareProcessorTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareProcessorTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/context-addition.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-addition.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/context-addition.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-addition.xml
diff --git a/org.springframework.web.struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages.properties b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages.properties
similarity index 100%
rename from org.springframework.web.struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages.properties
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages.properties
diff --git a/org.springframework.web.struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages_en_GB.properties b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_GB.properties
similarity index 100%
rename from org.springframework.web.struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages_en_GB.properties
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_GB.properties
diff --git a/org.springframework.web.struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages_en_US.properties b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_US.properties
similarity index 100%
rename from org.springframework.web.struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages_en_US.properties
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_US.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/contextInclude.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/contextInclude.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/contextInclude.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/contextInclude.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/empty-context.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-context.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/empty-context.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-context.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/empty-servlet.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-servlet.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/empty-servlet.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-servlet.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/fail.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/fail.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/fail.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/fail.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/more-context-messages.properties b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/more-context-messages.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/more-context-messages.properties
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/more-context-messages.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/myoverride.properties b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/myoverride.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/myoverride.properties
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/myoverride.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/myplaceholder.properties b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/myplaceholder.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/myplaceholder.properties
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/myplaceholder.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/resources/messageSource.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/messageSource.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/resources/messageSource.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/messageSource.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/resources/themeSource.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/themeSource.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/resources/themeSource.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/themeSource.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/test-messages.properties b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-messages.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/test-messages.properties
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-messages.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/test-theme.properties b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-theme.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/test-theme.properties
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-theme.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/theme.properties b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/theme.properties
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/theme_en_GB.properties b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme_en_GB.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/theme_en_GB.properties
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme_en_GB.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/theme_en_US.properties b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme_en_US.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/theme_en_US.properties
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme_en_US.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/web.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/web.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/WEB-INF/web.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/web.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/beans1.xml b/spring-webmvc/src/test/java/org/springframework/web/context/beans1.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/beans1.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/beans1.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/ref1.xml b/spring-webmvc/src/test/java/org/springframework/web/context/ref1.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/ref1.xml
rename to spring-webmvc/src/test/java/org/springframework/web/context/ref1.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/FlashMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/FlashMapTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/complexviews.properties b/spring-webmvc/src/test/java/org/springframework/web/servlet/complexviews.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/complexviews.properties
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/complexviews.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/resources/bar.css b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/resources/bar.css
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/resources/bar.css
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/handler/resources/bar.css
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/resources/foo.css b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/resources/foo.css
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/resources/foo.css
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/handler/resources/foo.css
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/resources/js/bar.js b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/resources/js/bar.js
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/resources/js/bar.js
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/handler/resources/js/bar.js
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/resources/js/foo.js b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/resources/js/foo.js
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/resources/js/foo.js
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/handler/resources/js/foo.js
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/i18n/SessionLocaleResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/SessionLocaleResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/i18n/SessionLocaleResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/SessionLocaleResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/AdminController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/AdminController.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/AdminController.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/AdminController.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/BookController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/BookController.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/BookController.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/BookController.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/BuyForm.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/BuyForm.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/BuyForm.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/BuyForm.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameController.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameController.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameController.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/IndexController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/IndexController.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/IndexController.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/IndexController.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/MethodNameDispatchingController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/MethodNameDispatchingController.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/MethodNameDispatchingController.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/MethodNameDispatchingController.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Controller.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Controller.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Controller.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Controller.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/WelcomeController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/WelcomeController.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/WelcomeController.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/WelcomeController.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolderTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolderTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolderTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/AdminController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/AdminController.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/AdminController.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/AdminController.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/BuyForm.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/BuyForm.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/BuyForm.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/BuyForm.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandlerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandlerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandlerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/multiaction/MultiActionControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/multiaction/MultiActionControllerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/multiaction/MultiActionControllerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/multiaction/MultiActionControllerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/DefaultFlashMapManagerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DefaultFlashMapManagerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/DefaultFlashMapManagerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/support/DefaultFlashMapManagerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/AbstractTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/AbstractTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/AbstractTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/AbstractTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/ParamTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/ParamTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/Country.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/Country.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/Country.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/Country.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/TagIdGeneratorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagIdGeneratorTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/TagIdGeneratorTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagIdGeneratorTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/TestBeanWithRealCountry.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestBeanWithRealCountry.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/TestBeanWithRealCountry.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestBeanWithRealCountry.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/theme/ThemeResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/theme/ThemeResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/theme/ThemeResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/theme/ThemeResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslatorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslatorTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslatorTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslatorTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/DummyMacroRequestContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/DummyMacroRequestContext.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/DummyMacroRequestContext.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/DummyMacroRequestContext.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/document/template.xls b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template.xls
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/document/template.xls
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template.xls
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/document/template_de.xls b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template_de.xls
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/document/template_de.xls
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template_de.xls
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/document/template_en_US.xls b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template_en_US.xls
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/document/template_en_US.xls
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template_en_US.xls
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTest.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTest.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTest.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTest.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTest.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTest.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTest.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTest.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/test.ftl b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/test.ftl
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/test.ftl
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/test.ftl
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractConfigurableJasperReportsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractConfigurableJasperReportsViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractConfigurableJasperReportsViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractConfigurableJasperReportsViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportViewResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportViewResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportViewResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/view.properties b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/view.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/jasperreports/view.properties
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/view.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/json/MappingJacksonJsonViewTest.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJacksonJsonViewTest.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/json/MappingJacksonJsonViewTest.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJacksonJsonViewTest.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/testviews.properties b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/testviews.properties
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/testviews_en.properties b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews_en.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/testviews_en.properties
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews_en.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/testviews_fr.properties b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews_fr.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/testviews_fr.properties
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews_fr.properties
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/tiles2/tiles-definitions.xml b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles2/tiles-definitions.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/tiles2/tiles-definitions.xml
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles2/tiles-definitions.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/error.vm b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/error.vm
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/error.vm
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/error.vm
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/ioerror.vm b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/ioerror.vm
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/ioerror.vm
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/ioerror.vm
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/simple.vm b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/simple.vm
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/simple.vm
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/simple.vm
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/test.vm b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/test.vm
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/test.vm
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/test.vm
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/toolbox.xml b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/toolbox.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/toolbox.xml
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/toolbox.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/views.xml b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/views.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/views.xml
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/views.xml
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewResolverTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewResolverTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewResolverTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/util/NestedServletExceptionTests.java b/spring-webmvc/src/test/java/org/springframework/web/util/NestedServletExceptionTests.java
similarity index 100%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/util/NestedServletExceptionTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/util/NestedServletExceptionTests.java
diff --git a/org.springframework.web.servlet/src/test/resources/log4j.xml b/spring-webmvc/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/log4j.xml
rename to spring-webmvc/src/test/resources/log4j.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper b/spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper
rename to spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml b/spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml
rename to spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties b/spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties
rename to spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper b/spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper
rename to spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml b/spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml
rename to spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper b/spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper
rename to spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml b/spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml
rename to spring-webmvc/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/complexviews.properties b/spring-webmvc/src/test/resources/org/springframework/web/servlet/complexviews.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/complexviews.properties
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/complexviews.properties
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/annotation/testStylesheet.css b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/annotation/testStylesheet.css
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/annotation/testStylesheet.css
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/annotation/testStylesheet.css
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-argument-resolvers.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-argument-resolvers.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-argument-resolvers.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-argument-resolvers.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-bean-decoration.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-bean-decoration.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-bean-decoration.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-bean-decoration.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-conversion-service.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-conversion-service.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-conversion-service.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-conversion-service.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet-optional-attrs.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet-optional-attrs.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet-optional-attrs.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet-optional-attrs.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-codes-resolver.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-codes-resolver.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-codes-resolver.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-codes-resolver.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters-defaults-off.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters-defaults-off.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters-defaults-off.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters-defaults-off.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-optional-attrs.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-optional-attrs.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-optional-attrs.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-optional-attrs.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-return-value-handlers.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-return-value-handlers.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-return-value-handlers.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-return-value-handlers.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map1.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map1.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map1.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map1.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2.properties b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.properties
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2.properties
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.properties
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2err.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map3.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map3.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map3.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map3.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml
diff --git a/org.springframework.web/src/test/resources/org/springframework/http/converter/logo.jpg b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/method/annotation/logo.jpg
similarity index 100%
rename from org.springframework.web/src/test/resources/org/springframework/http/converter/logo.jpg
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/method/annotation/logo.jpg
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/bar.css b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/bar.css
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/bar.css
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/bar.css
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/foo.css b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/foo.css
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/foo.css
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/foo.css
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/foo.html b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/foo.html
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/foo.html
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/foo.html
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/foo.txt b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/foo.txt
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/foo.txt
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/foo.txt
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/js/bar.js b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/js/bar.js
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/js/bar.js
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/js/bar.js
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/js/foo.js b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/js/foo.js
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/test/js/foo.js
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/js/foo.js
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/bar.css b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/bar.css
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/bar.css
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/bar.css
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/baz.css b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/baz.css
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/baz.css
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/baz.css
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/foo.css b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/foo.css
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/foo.css
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/foo.css
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/bar.js b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/bar.js
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/bar.js
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/bar.js
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/baz.js b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/baz.js
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/baz.js
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/baz.js
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/foo.js b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/foo.js
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/foo.js
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testalternatepath/js/foo.js
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testsecret/secret.txt b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testsecret/secret.txt
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testsecret/secret.txt
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/testsecret/secret.txt
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/dummyData.xsl b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/dummyData.xsl
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/dummyData.xsl
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/dummyData.xsl
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/errors.xsl b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/errors.xsl
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/errors.xsl
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/errors.xsl
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/firstWords.xsl b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/firstWords.xsl
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/firstWords.xsl
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/firstWords.xsl
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/productData.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/productData.xml
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/productData.xml
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/productData.xml
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/products.xsl b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/products.xsl
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/products.xsl
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/products.xsl
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/productsImport.xsl b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/productsImport.xsl
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/productsImport.xsl
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/productsImport.xsl
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/sunnyDay.xsl b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/sunnyDay.xsl
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/sunnyDay.xsl
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/sunnyDay.xsl
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/sunnyDayExplicitRoot.xsl b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/sunnyDayExplicitRoot.xsl
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/sunnyDayExplicitRoot.xsl
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/sunnyDayExplicitRoot.xsl
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/valid.xsl b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/valid.xsl
similarity index 100%
rename from org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/view/xslt/valid.xsl
rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/xslt/valid.xsl
diff --git a/org.springframework.web.servlet/template.mf b/spring-webmvc/template.mf
similarity index 100%
rename from org.springframework.web.servlet/template.mf
rename to spring-webmvc/template.mf