diff --git a/org.springframework.aspects/src/main/java/org/springframework/context/annotation/EnableSpringConfigured.java b/org.springframework.aspects/src/main/java/org/springframework/context/annotation/aspectj/EnableSpringConfigured.java
similarity index 96%
rename from org.springframework.aspects/src/main/java/org/springframework/context/annotation/EnableSpringConfigured.java
rename to org.springframework.aspects/src/main/java/org/springframework/context/annotation/aspectj/EnableSpringConfigured.java
index 0b49f7c5b74..9451997ce43 100644
--- a/org.springframework.aspects/src/main/java/org/springframework/context/annotation/EnableSpringConfigured.java
+++ b/org.springframework.aspects/src/main/java/org/springframework/context/annotation/aspectj/EnableSpringConfigured.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.annotation;
+package org.springframework.context.annotation.aspectj;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/org.springframework.aspects/src/main/java/org/springframework/context/annotation/SpringConfiguredConfiguration.java b/org.springframework.aspects/src/main/java/org/springframework/context/annotation/aspectj/SpringConfiguredConfiguration.java
similarity index 97%
rename from org.springframework.aspects/src/main/java/org/springframework/context/annotation/SpringConfiguredConfiguration.java
rename to org.springframework.aspects/src/main/java/org/springframework/context/annotation/aspectj/SpringConfiguredConfiguration.java
index 4f1fe7d883e..2471296f832 100644
--- a/org.springframework.aspects/src/main/java/org/springframework/context/annotation/SpringConfiguredConfiguration.java
+++ b/org.springframework.aspects/src/main/java/org/springframework/context/annotation/aspectj/SpringConfiguredConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.annotation;
+package org.springframework.context.annotation.aspectj;
 
 import org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect;
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/org.springframework.aspects/src/test/java/org/springframework/context/annotation/AnnotationBeanConfigurerTests.java b/org.springframework.aspects/src/test/java/org/springframework/context/annotation/aspectj/AnnotationBeanConfigurerTests.java
similarity index 80%
rename from org.springframework.aspects/src/test/java/org/springframework/context/annotation/AnnotationBeanConfigurerTests.java
rename to org.springframework.aspects/src/test/java/org/springframework/context/annotation/aspectj/AnnotationBeanConfigurerTests.java
index 9165b89cb29..69dc45b2779 100644
--- a/org.springframework.aspects/src/test/java/org/springframework/context/annotation/AnnotationBeanConfigurerTests.java
+++ b/org.springframework.aspects/src/test/java/org/springframework/context/annotation/aspectj/AnnotationBeanConfigurerTests.java
@@ -14,10 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.context.annotation;
+package org.springframework.context.annotation.aspectj;
 
 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;
+import org.springframework.context.annotation.aspectj.EnableSpringConfigured;
 
 /**
  * Tests that @EnableSpringConfigured properly registers an