diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/Bean.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/Bean.java
similarity index 98%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/Bean.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/Bean.java
index 8898a08ef5..cda9f937fa 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/Bean.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/Bean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java;
+package org.springframework.context.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/Configuration.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/Configuration.java
similarity index 94%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/Configuration.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/Configuration.java
index 5a70edb3b6..cdfbd52a39 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/Configuration.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/Configuration.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java;
+package org.springframework.context.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
 
 import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 import org.springframework.stereotype.Component;
 
 
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/Import.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/Import.java
similarity index 96%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/Import.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/Import.java
index d74153cae6..9a5aacfec1 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/Import.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/Import.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java;
+package org.springframework.context.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/StandardScopes.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/StandardScopes.java
similarity index 96%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/StandardScopes.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/StandardScopes.java
index a89151f5bd..e28cc96eff 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/StandardScopes.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/StandardScopes.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java;
+package org.springframework.context.annotation;
 
 
 /**
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AbstractConfigurationClassProcessor.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AbstractConfigurationClassProcessor.java
similarity index 96%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/AbstractConfigurationClassProcessor.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AbstractConfigurationClassProcessor.java
index b6fadec63c..040fce4106 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AbstractConfigurationClassProcessor.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AbstractConfigurationClassProcessor.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.FailFastProblemReporter;
 import org.springframework.beans.factory.parsing.ProblemReporter;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 
 /**
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AddAnnotationAdapter.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AddAnnotationAdapter.java
similarity index 98%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/AddAnnotationAdapter.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AddAnnotationAdapter.java
index 6c333969a1..e58659ade1 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AddAnnotationAdapter.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AddAnnotationAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import net.sf.cglib.asm.Constants;
 
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AnnotationAdapter.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AnnotationAdapter.java
similarity index 97%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/AnnotationAdapter.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AnnotationAdapter.java
index 6fd9f365a7..a2ec5dcb6e 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AnnotationAdapter.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AnnotationAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import org.springframework.asm.AnnotationVisitor;
 
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AsmUtils.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AsmUtils.java
similarity index 98%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/AsmUtils.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AsmUtils.java
index 909a5f30df..6e5d9dd85e 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AsmUtils.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AsmUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/BeanMethod.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethod.java
similarity index 96%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/BeanMethod.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethod.java
index 1f533a8af3..9a3284d1ed 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/BeanMethod.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethod.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
-import static org.springframework.config.java.StandardScopes.*;
+import static org.springframework.context.annotation.StandardScopes.*;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Modifier;
@@ -26,8 +26,8 @@ import org.springframework.beans.BeanMetadataElement;
 import org.springframework.beans.factory.parsing.Location;
 import org.springframework.beans.factory.parsing.Problem;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.util.Assert;
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/BeanMethodInterceptor.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethodInterceptor.java
similarity index 97%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/BeanMethodInterceptor.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethodInterceptor.java
index 33fd91b87a..3067e7a11e 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/BeanMethodInterceptor.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethodInterceptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 
@@ -26,7 +26,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.core.annotation.AnnotationUtils;
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClass.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClass.java
similarity index 97%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClass.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClass.java
index 41a4207a6b..8491e4c8bc 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClass.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClass.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 
@@ -23,8 +23,8 @@ import java.util.Set;
 
 import org.springframework.beans.factory.parsing.Problem;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.util.Assert;
 
 
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassMethodVisitor.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassMethodVisitor.java
similarity index 92%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassMethodVisitor.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassMethodVisitor.java
index f445aed2e6..1ec1dc5dbe 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassMethodVisitor.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassMethodVisitor.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
-import static org.springframework.config.java.support.AsmUtils.*;
-import static org.springframework.config.java.support.MutableAnnotationUtils.*;
-import static org.springframework.config.java.support.Util.*;
+import static org.springframework.context.annotation.support.AsmUtils.*;
+import static org.springframework.context.annotation.support.MutableAnnotationUtils.*;
+import static org.springframework.context.annotation.support.Util.*;
 import static org.springframework.util.ClassUtils.*;
 
 import java.lang.annotation.Annotation;
@@ -29,8 +29,8 @@ import org.springframework.asm.Label;
 import org.springframework.asm.MethodAdapter;
 import org.springframework.asm.MethodVisitor;
 import org.springframework.asm.Opcodes;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 
 /**
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassPostProcessor.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassPostProcessor.java
similarity index 97%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassPostProcessor.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassPostProcessor.java
index da2cfa173f..556d81db17 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassPostProcessor.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassPostProcessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 
@@ -27,8 +27,8 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.ClassMetadata;
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassVisitor.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassVisitor.java
similarity index 96%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassVisitor.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassVisitor.java
index ea83eca2c3..4dd8079e02 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassVisitor.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassVisitor.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
-import static org.springframework.config.java.support.MutableAnnotationUtils.*;
+import static org.springframework.context.annotation.support.MutableAnnotationUtils.*;
 import static org.springframework.util.ClassUtils.*;
 
 import java.util.HashMap;
@@ -31,8 +31,8 @@ import org.springframework.asm.Opcodes;
 import org.springframework.beans.factory.parsing.Location;
 import org.springframework.beans.factory.parsing.Problem;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.core.io.ClassPathResource;
 
 
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationEnhancer.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationEnhancer.java
similarity index 96%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationEnhancer.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationEnhancer.java
index 841a388202..7d352d1516 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationEnhancer.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationEnhancer.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
-import static org.springframework.config.java.support.Util.*;
+import static org.springframework.context.annotation.support.Util.*;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -34,8 +34,8 @@ import org.springframework.asm.ClassAdapter;
 import org.springframework.asm.ClassReader;
 import org.springframework.asm.ClassWriter;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.Assert;
 
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationModel.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModel.java
similarity index 94%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationModel.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModel.java
index 0cb10c4c0e..d297dc2bd4 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationModel.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModel.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 
@@ -21,7 +21,7 @@ import java.util.LinkedHashSet;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Configuration;
 
 
 /**
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationModelBeanDefinitionReader.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModelBeanDefinitionReader.java
similarity index 98%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationModelBeanDefinitionReader.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModelBeanDefinitionReader.java
index 8e98b3e8a8..63281bebfd 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationModelBeanDefinitionReader.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModelBeanDefinitionReader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 import static org.springframework.util.StringUtils.*;
@@ -35,8 +35,8 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.core.io.Resource;
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationParser.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationParser.java
similarity index 96%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationParser.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationParser.java
index 9f6323afdb..3cf8e7540a 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationParser.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationParser.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import org.springframework.asm.ClassReader;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.util.ClassUtils;
 
 
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ImportAnnotationVisitor.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportAnnotationVisitor.java
similarity index 93%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ImportAnnotationVisitor.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportAnnotationVisitor.java
index 22c1274690..5e30e9cb1d 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ImportAnnotationVisitor.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportAnnotationVisitor.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
-import static org.springframework.config.java.support.AsmUtils.*;
+import static org.springframework.context.annotation.support.AsmUtils.*;
 import static org.springframework.util.ClassUtils.*;
 
 import java.util.ArrayList;
@@ -25,7 +25,7 @@ import org.springframework.asm.AnnotationVisitor;
 import org.springframework.asm.ClassReader;
 import org.springframework.asm.Type;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Import;
 import org.springframework.util.Assert;
 
 
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ImportStack.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStack.java
similarity index 95%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ImportStack.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStack.java
index 70967bc084..79dadd58ec 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ImportStack.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStack.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.Stack;
 
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Import;
 import org.springframework.util.Assert;
 
 
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ImportStackHolder.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStackHolder.java
similarity index 91%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ImportStackHolder.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStackHolder.java
index 06bad1290d..c9f65423fa 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ImportStackHolder.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStackHolder.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Import;
 
 
 /**
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ModelClass.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ModelClass.java
similarity index 98%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/ModelClass.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ModelClass.java
index f3d33c2d55..d2e8958dbc 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ModelClass.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ModelClass.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static org.springframework.util.ClassUtils.*;
 
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotation.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotation.java
similarity index 96%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotation.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotation.java
index 377f72b56a..108a87e045 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotation.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 /**
  * Note: the visibility of this interface would be reduced to package-private save for an
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationArrayVisitor.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationArrayVisitor.java
similarity index 91%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationArrayVisitor.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationArrayVisitor.java
index a31681513f..77c5d14c01 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationArrayVisitor.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationArrayVisitor.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
-import static org.springframework.config.java.support.MutableAnnotationUtils.*;
-import static org.springframework.config.java.support.Util.*;
+import static org.springframework.context.annotation.support.MutableAnnotationUtils.*;
+import static org.springframework.context.annotation.support.Util.*;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationInvocationHandler.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationInvocationHandler.java
similarity index 99%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationInvocationHandler.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationInvocationHandler.java
index d9e410dcfb..cbd8aaf017 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationInvocationHandler.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationInvocationHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 import static org.springframework.core.annotation.AnnotationUtils.*;
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationUtils.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationUtils.java
similarity index 96%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationUtils.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationUtils.java
index 6aa09a1502..aee3120c5a 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationUtils.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Proxy;
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationVisitor.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationVisitor.java
similarity index 94%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationVisitor.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationVisitor.java
index be23fcac94..33705a4b35 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/MutableAnnotationVisitor.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationVisitor.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
-import static org.springframework.config.java.support.MutableAnnotationUtils.*;
-import static org.springframework.config.java.support.Util.*;
+import static org.springframework.context.annotation.support.MutableAnnotationUtils.*;
+import static org.springframework.context.annotation.support.Util.*;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/Util.java b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/Util.java
similarity index 99%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/support/Util.java
rename to org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/Util.java
index ab5e20ecf6..9ef09de974 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/Util.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/Util.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 import static org.springframework.util.ClassUtils.*;
diff --git a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/package-info.java b/org.springframework.config.java/src/test/java/org/springframework/config/java/support/package-info.java
deleted file mode 100644
index ed5d2dffe8..0000000000
--- a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Unit tests for support classes related to 
- * {@link org.springframework.config.java.Configuration} class processing.
- * 
- * @author Chris Beams
- */
-package org.springframework.config.java.support;
\ No newline at end of file
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java
index 0ad5f8de81..3012659a77 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java
@@ -22,9 +22,9 @@ import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 
 /**
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java
index 68772b322c..b7f8d69c80 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java
@@ -8,9 +8,9 @@ import org.aspectj.lang.annotation.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
index 0a97cc1fbb..9b3c26ac87 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
@@ -6,8 +6,8 @@ import static org.junit.Assert.*;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import test.beans.Colour;
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml
index 4cb14bec88..442ef6d342 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml
@@ -7,9 +7,9 @@
 
 	<context:annotation-config/>
 	
-	<bean class="org.springframework.config.java.support.ConfigurationClassPostProcessor"/>
+	<bean class="org.springframework.context.annotation.support.ConfigurationClassPostProcessor"/>
 	
-	<bean class="test.basic.AutowiredConfigurationTests$AutowiredConfig"/>
-	<bean class="test.basic.AutowiredConfigurationTests$ColorConfig"/>
+	<bean class="org.springframework.context.annotation.configuration.AutowiredConfigurationTests$AutowiredConfig"/>
+	<bean class="org.springframework.context.annotation.configuration.AutowiredConfigurationTests$ColorConfig"/>
 	
 </beans>
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java
index ef9661195e..d8a0e1b6ed 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java
@@ -11,11 +11,11 @@ import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostP
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.StandardScopes;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.StandardScopes;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 import test.beans.ITestBean;
 import test.beans.TestBean;
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
index 2d2b59d185..5535d0c0cd 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
@@ -22,10 +22,10 @@ import org.junit.Test;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.Import;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 import test.beans.ITestBean;
 import test.beans.TestBean;
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java
index b5430f9add..32f24ad04f 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java
@@ -20,9 +20,9 @@ import java.lang.annotation.Inherited;
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 import test.beans.TestBean;
 
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
index d7b4e22503..0a13c2cc13 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
@@ -25,12 +25,12 @@ import org.junit.Test;
 import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.StandardScopes;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
+import org.springframework.context.annotation.StandardScopes;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 import org.springframework.context.support.GenericApplicationContext;
 
 import test.beans.CustomScope;
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml
index b7e0868c4e..4f8709cb7d 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml
@@ -7,9 +7,9 @@
 
 	<context:annotation-config/>
 	
-	<bean class="org.springframework.config.java.support.ConfigurationClassPostProcessor"/>
+	<bean class="org.springframework.context.annotation.support.ConfigurationClassPostProcessor"/>
 	
-	<bean class="test.basic.AutowiredConfigurationTests$ValueConfig"/>
+	<bean class="org.springframework.context.annotation.configuration.AutowiredConfigurationTests$ValueConfig"/>
 	
 <!--
 	<context:component-scan  base-package="test.basic.value"/>
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java
index 66afa6d676..1746f9e9cb 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java
@@ -1,10 +1,10 @@
 /**
- * Integration tests for {@link org.springframework.config.java.Configuration}
+ * Integration tests for {@link org.springframework.context.annotation.Configuration}
  * class processing.
  * 
  * @author Chris Beams
- * @see org.springframework.config.java.Configuration
- * @see org.springframework.config.java.Bean
- * @see org.springframework.config.java.support.ConfigurationClassPostProcessor
+ * @see org.springframework.context.annotation.Configuration
+ * @see org.springframework.context.annotation.Bean
+ * @see org.springframework.context.annotation.support.ConfigurationClassPostProcessor
  */
 package org.springframework.context.annotation.configuration;
\ No newline at end of file
diff --git a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/AbstractCircularImportDetectionTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AbstractCircularImportDetectionTests.java
similarity index 92%
rename from org.springframework.config.java/src/test/java/org/springframework/config/java/support/AbstractCircularImportDetectionTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AbstractCircularImportDetectionTests.java
index 2f80106373..1d8f4cdaa8 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/AbstractCircularImportDetectionTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AbstractCircularImportDetectionTests.java
@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.support.ConfigurationParser;
 
 import test.beans.TestBean;
 
diff --git a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/AsmCircularImportDetectionTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AsmCircularImportDetectionTests.java
similarity index 89%
rename from org.springframework.config.java/src/test/java/org/springframework/config/java/support/AsmCircularImportDetectionTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AsmCircularImportDetectionTests.java
index ab510bca98..f18097cc57 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/AsmCircularImportDetectionTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AsmCircularImportDetectionTests.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import org.springframework.beans.factory.parsing.FailFastProblemReporter;
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.support.ConfigurationParser;
 import org.springframework.util.ClassUtils;
 
 
diff --git a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/BeanMethodTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/BeanMethodTests.java
similarity index 93%
rename from org.springframework.config.java/src/test/java/org/springframework/config/java/support/BeanMethodTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/BeanMethodTests.java
index 91e5fa9c4b..fe4e82e7a8 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/BeanMethodTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/BeanMethodTests.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
-import static org.springframework.config.java.StandardScopes.*;
-import static org.springframework.config.java.support.MutableAnnotationUtils.*;
 import static org.springframework.context.annotation.ScopedProxyMode.*;
+import static org.springframework.context.annotation.StandardScopes.*;
+import static org.springframework.context.annotation.support.MutableAnnotationUtils.*;
 
 import java.lang.reflect.Modifier;
 
@@ -28,8 +28,11 @@ import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.parsing.FailFastProblemReporter;
 import org.springframework.beans.factory.parsing.Location;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Bean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.support.BeanMethod;
+import org.springframework.context.annotation.support.ConfigurationClass;
+import org.springframework.context.annotation.support.ModelClass;
 import org.springframework.core.io.ClassPathResource;
 
 
diff --git a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/ConfigurationModelTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationModelTests.java
similarity index 86%
rename from org.springframework.config.java/src/test/java/org/springframework/config/java/support/ConfigurationModelTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationModelTests.java
index 2660be6245..c0b753f90f 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/ConfigurationModelTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationModelTests.java
@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
+import org.springframework.context.annotation.support.ConfigurationClass;
+import org.springframework.context.annotation.support.ConfigurationModel;
 
 
 /**
diff --git a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/ConfigurationPostProcessorTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationPostProcessorTests.java
similarity index 95%
rename from org.springframework.config.java/src/test/java/org/springframework/config/java/support/ConfigurationPostProcessorTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationPostProcessorTests.java
index dd7df11adf..11309a50f7 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/ConfigurationPostProcessorTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationPostProcessorTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -24,8 +24,9 @@ import java.util.Vector;
 
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 import org.springframework.util.ClassUtils;
 
 
diff --git a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/InvalidConfigurationClassDefinitionTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/InvalidConfigurationClassDefinitionTests.java
similarity index 90%
rename from org.springframework.config.java/src/test/java/org/springframework/config/java/support/InvalidConfigurationClassDefinitionTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/InvalidConfigurationClassDefinitionTests.java
index 783a3a4908..ae30c5b9c7 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/InvalidConfigurationClassDefinitionTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/InvalidConfigurationClassDefinitionTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static org.junit.Assert.*;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
@@ -22,7 +22,8 @@ import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 
 /**
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/package-info.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/package-info.java
new file mode 100644
index 0000000000..d01bd1bc22
--- /dev/null
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * Unit tests for support classes related to 
+ * {@link org.springframework.context.annotation.Configuration} class processing.
+ * 
+ * @author Chris Beams
+ */
+package org.springframework.context.annotation.support;
\ No newline at end of file