diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationContext.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationContext.java
index c3aa9075..e61ac092 100644
--- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationContext.java
+++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationContext.java
@@ -22,7 +22,7 @@ import java.util.function.Consumer;
 
 import org.springframework.lang.Nullable;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.oauth2.core.context.Context;
+import org.springframework.security.oauth2.server.authorization.context.Context;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/core/context/Context.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/Context.java
similarity index 93%
rename from oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/core/context/Context.java
rename to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/Context.java
index 7d5f780f..865fb974 100644
--- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/core/context/Context.java
+++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/Context.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.core.context;
+package org.springframework.security.oauth2.server.authorization.context;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenContext.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenContext.java
index 381afccf..9ed25a99 100644
--- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenContext.java
+++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenContext.java
@@ -25,9 +25,9 @@ import org.springframework.lang.Nullable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.OAuth2TokenType;
-import org.springframework.security.oauth2.core.context.Context;
 import org.springframework.security.oauth2.server.authorization.OAuth2Authorization;
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
+import org.springframework.security.oauth2.server.authorization.context.Context;
 import org.springframework.security.oauth2.server.authorization.context.ProviderContext;
 import org.springframework.util.Assert;