diff --git a/spring-core/src/main/java/org/springframework/aot/hint/annotation/BindingReflectionHintsRegistrar.java b/spring-core/src/main/java/org/springframework/aot/hint/BindingReflectionHintsRegistrar.java
similarity index 96%
rename from spring-core/src/main/java/org/springframework/aot/hint/annotation/BindingReflectionHintsRegistrar.java
rename to spring-core/src/main/java/org/springframework/aot/hint/BindingReflectionHintsRegistrar.java
index 6df176ab885..35b4b5993d9 100644
--- a/spring-core/src/main/java/org/springframework/aot/hint/annotation/BindingReflectionHintsRegistrar.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/BindingReflectionHintsRegistrar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.hint.annotation;
+package org.springframework.aot.hint;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -29,9 +29,6 @@ import java.util.Set;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.aot.hint.ExecutableMode;
-import org.springframework.aot.hint.MemberCategory;
-import org.springframework.aot.hint.ReflectionHints;
 import org.springframework.core.KotlinDetector;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
diff --git a/spring-core/src/main/java/org/springframework/aot/hint/annotation/RegisterReflectionForBindingProcessor.java b/spring-core/src/main/java/org/springframework/aot/hint/annotation/RegisterReflectionForBindingProcessor.java
index b83a7667551..b92e1549ba8 100644
--- a/spring-core/src/main/java/org/springframework/aot/hint/annotation/RegisterReflectionForBindingProcessor.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/annotation/RegisterReflectionForBindingProcessor.java
@@ -18,6 +18,7 @@ package org.springframework.aot.hint.annotation;
 
 import java.lang.reflect.AnnotatedElement;
 
+import org.springframework.aot.hint.BindingReflectionHintsRegistrar;
 import org.springframework.aot.hint.ReflectionHints;
 import org.springframework.core.annotation.AnnotationUtils;
 
diff --git a/spring-core/src/test/java/org/springframework/aot/hint/annotation/BindingReflectionHintsRegistrarTests.java b/spring-core/src/test/java/org/springframework/aot/hint/BindingReflectionHintsRegistrarTests.java
similarity index 97%
rename from spring-core/src/test/java/org/springframework/aot/hint/annotation/BindingReflectionHintsRegistrarTests.java
rename to spring-core/src/test/java/org/springframework/aot/hint/BindingReflectionHintsRegistrarTests.java
index 3e9713e5ca7..266738136d7 100644
--- a/spring-core/src/test/java/org/springframework/aot/hint/annotation/BindingReflectionHintsRegistrarTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/BindingReflectionHintsRegistrarTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.hint.annotation;
+package org.springframework.aot.hint;
 
 import java.lang.reflect.Type;
 import java.util.List;
@@ -22,10 +22,6 @@ import java.util.Set;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.aot.hint.ExecutableMode;
-import org.springframework.aot.hint.MemberCategory;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.TypeReference;
 import org.springframework.core.ResolvableType;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-core/src/test/java/org/springframework/aot/hint/annotation/RegisterReflectionForBindingProcessorTests.java b/spring-core/src/test/java/org/springframework/aot/hint/annotation/RegisterReflectionForBindingProcessorTests.java
index ac8d54bb5ad..59c5434fa24 100644
--- a/spring-core/src/test/java/org/springframework/aot/hint/annotation/RegisterReflectionForBindingProcessorTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/annotation/RegisterReflectionForBindingProcessorTests.java
@@ -67,9 +67,6 @@ public class RegisterReflectionForBindingProcessorTests {
 			return null;
 		}
 
-		public BindingReflectionHintsRegistrarTests.SampleEmptyClass unmanaged() {
-			return null;
-		}
 	}
 
 }
diff --git a/spring-core/src/test/kotlin/org/springframework/aot/hint/annotation/KotlinBindingReflectionHintsRegistrarTests.kt b/spring-core/src/test/kotlin/org/springframework/aot/hint/KotlinBindingReflectionHintsRegistrarTests.kt
similarity index 96%
rename from spring-core/src/test/kotlin/org/springframework/aot/hint/annotation/KotlinBindingReflectionHintsRegistrarTests.kt
rename to spring-core/src/test/kotlin/org/springframework/aot/hint/KotlinBindingReflectionHintsRegistrarTests.kt
index 45357a4e06d..67819bac415 100644
--- a/spring-core/src/test/kotlin/org/springframework/aot/hint/annotation/KotlinBindingReflectionHintsRegistrarTests.kt
+++ b/spring-core/src/test/kotlin/org/springframework/aot/hint/KotlinBindingReflectionHintsRegistrarTests.kt
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.hint.annotation
+package org.springframework.aot.hint
 
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.ThrowingConsumer
 import org.junit.jupiter.api.Test
-import org.springframework.aot.hint.*
 
 /**
  * Tests for Kotlin support in [BindingReflectionHintsRegistrar].
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageMappingReflectiveProcessor.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageMappingReflectiveProcessor.java
index fc3c53bdaaa..06d67a8931a 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageMappingReflectiveProcessor.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageMappingReflectiveProcessor.java
@@ -22,9 +22,9 @@ import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
 import java.security.Principal;
 
+import org.springframework.aot.hint.BindingReflectionHintsRegistrar;
 import org.springframework.aot.hint.ExecutableMode;
 import org.springframework.aot.hint.ReflectionHints;
-import org.springframework.aot.hint.annotation.BindingReflectionHintsRegistrar;
 import org.springframework.aot.hint.annotation.ReflectiveProcessor;
 import org.springframework.core.MethodParameter;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMappingReflectiveProcessor.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMappingReflectiveProcessor.java
index 8b560050c8b..d2b03f12c17 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMappingReflectiveProcessor.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMappingReflectiveProcessor.java
@@ -21,9 +21,9 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
 
+import org.springframework.aot.hint.BindingReflectionHintsRegistrar;
 import org.springframework.aot.hint.ExecutableMode;
 import org.springframework.aot.hint.ReflectionHints;
-import org.springframework.aot.hint.annotation.BindingReflectionHintsRegistrar;
 import org.springframework.aot.hint.annotation.ReflectiveProcessor;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.AnnotatedElementUtils;