diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/EnableSpringConfigured.java b/spring-aspects/src/main/java/org/springframework/context/annotation/EnableSpringConfigured.java
similarity index 69%
rename from spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/EnableSpringConfigured.java
rename to spring-aspects/src/main/java/org/springframework/context/annotation/EnableSpringConfigured.java
index 68b7aab4a7..0b49f7c5b7 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/EnableSpringConfigured.java
+++ b/spring-aspects/src/main/java/org/springframework/context/annotation/EnableSpringConfigured.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.aspectj;
+package org.springframework.context.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -25,14 +25,16 @@ import java.lang.annotation.Target;
 import org.springframework.context.annotation.Import;
 
 /**
- * Signals the current application context to apply dependency injection to non-managed
- * classes that are instantiated outside of the Spring bean factory (typically classes
- * annotated with the @{@link org.springframework.beans.factory.annotation.Configurable
+ * Signals the current application context to apply dependency injection to
+ * non-managed classes that are instantiated outside of the Spring bean factory
+ * (typically classes annotated with the @
+ * {@link org.springframework.beans.factory.annotation.Configurable
  * Configurable} annotation).
  *
- * <p>Similar to functionality found in Spring's {@code <context:spring-configured>} XML
- * element. Often used in conjunction with {@link
- * org.springframework.context.annotation.EnableLoadTimeWeaving @EnableLoadTimeWeaving}.
+ * <p>Similar to functionality found in Spring's
+ * {@code <context:spring-configured>} XML element. Often used in conjunction
+ * with {@link org.springframework.context.annotation.EnableLoadTimeWeaving
+ * @EnableLoadTimeWeaving}.
  *
  * @author Chris Beams
  * @since 3.1
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/SpringConfiguredConfiguration.java b/spring-aspects/src/main/java/org/springframework/context/annotation/SpringConfiguredConfiguration.java
similarity index 90%
rename from spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/SpringConfiguredConfiguration.java
rename to spring-aspects/src/main/java/org/springframework/context/annotation/SpringConfiguredConfiguration.java
index 2c34e11ab2..4f1fe7d883 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/SpringConfiguredConfiguration.java
+++ b/spring-aspects/src/main/java/org/springframework/context/annotation/SpringConfiguredConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.aspectj;
+package org.springframework.context.annotation;
 
+import org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/context/annotation/AnnotationBeanConfigurerTests.java
similarity index 73%
rename from spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerTests.java
rename to spring-aspects/src/test/java/org/springframework/context/annotation/AnnotationBeanConfigurerTests.java
index 26e4ac0a9b..9165b89cb2 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerTests.java
+++ b/spring-aspects/src/test/java/org/springframework/context/annotation/AnnotationBeanConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.aspectj;
+package org.springframework.context.annotation;
 
+import org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
 
 /**
  * Tests that @EnableSpringConfigured properly registers an
- * {@link AnnotationBeanConfigurerAspect}, just as does {@code <context:spring-configured>}
+ * {@link org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect}, just
+ * as does {@code <context:spring-configured>}
  *
  * @author Chris Beams
  * @since 3.1