diff --git a/spring-ai-modules/pom.xml b/spring-ai-modules/pom.xml
index eb55f02320be..f0a562a55bf2 100644
--- a/spring-ai-modules/pom.xml
+++ b/spring-ai-modules/pom.xml
@@ -24,6 +24,7 @@
         <module>spring-ai-chat-stream</module>
         <module>spring-ai-introduction</module>
         <module>spring-ai-mcp</module>
+<!--        <module>spring-ai-mcp-oauth</module>--><!-- test failures -->
         <module>spring-ai-multiple-llms</module>
         <module>spring-ai-semantic-caching</module>
         <module>spring-ai-text-to-sql</module>
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/pom.xml b/spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/pom.xml
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/pom.xml
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/pom.xml
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/CalculatorController.java b/spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/CalculatorController.java
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/CalculatorController.java
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/CalculatorController.java
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/McpClientOauth2Application.java b/spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/McpClientOauth2Application.java
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/McpClientOauth2Application.java
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/McpClientOauth2Application.java
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/McpSyncClientExchangeFilterFunction.java b/spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/McpSyncClientExchangeFilterFunction.java
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/McpSyncClientExchangeFilterFunction.java
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/src/main/java/com/baeldung/mcp/mcpclientoauth2/McpSyncClientExchangeFilterFunction.java
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/src/main/resources/application.properties b/spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/src/main/resources/application.properties
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/src/main/resources/application.properties
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/src/main/resources/application.properties
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/src/test/java/com/baeldung/mcp/mcpclientoauth2/CalculatorControllerUnitTest.java b/spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/src/test/java/com/baeldung/mcp/mcpclientoauth2/CalculatorControllerUnitTest.java
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/src/test/java/com/baeldung/mcp/mcpclientoauth2/CalculatorControllerUnitTest.java
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-client-oauth2/src/test/java/com/baeldung/mcp/mcpclientoauth2/CalculatorControllerUnitTest.java
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/pom.xml b/spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/pom.xml
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/pom.xml
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/pom.xml
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/CalculatorService.java b/spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/CalculatorService.java
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/CalculatorService.java
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/CalculatorService.java
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/McpServerOauth2Application.java b/spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/McpServerOauth2Application.java
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/McpServerOauth2Application.java
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/McpServerOauth2Application.java
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/model/CalculationResult.java b/spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/model/CalculationResult.java
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/model/CalculationResult.java
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/src/main/java/com/baeldung/mcp/mcpserveroauth2/model/CalculationResult.java
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/src/main/resources/application.properties b/spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/src/main/resources/application.properties
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/src/main/resources/application.properties
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/src/main/resources/application.properties
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/src/test/java/com/baeldung/mcp/mcpserveroauth2/CalculatorServiceUnitTest.java b/spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/src/test/java/com/baeldung/mcp/mcpserveroauth2/CalculatorServiceUnitTest.java
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-server-oauth2/src/test/java/com/baeldung/mcp/mcpserveroauth2/CalculatorServiceUnitTest.java
rename to spring-ai-modules/spring-ai-mcp-oauth/mcp-server-oauth2/src/test/java/com/baeldung/mcp/mcpserveroauth2/CalculatorServiceUnitTest.java
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/oauth2-authorization-server/pom.xml b/spring-ai-modules/spring-ai-mcp-oauth/oauth2-authorization-server/pom.xml
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/oauth2-authorization-server/pom.xml
rename to spring-ai-modules/spring-ai-mcp-oauth/oauth2-authorization-server/pom.xml
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/oauth2-authorization-server/src/main/java/com/baeldung/mcp/oauth2authorizationserver/Oauth2AuthorizationServerApplication.java b/spring-ai-modules/spring-ai-mcp-oauth/oauth2-authorization-server/src/main/java/com/baeldung/mcp/oauth2authorizationserver/Oauth2AuthorizationServerApplication.java
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/oauth2-authorization-server/src/main/java/com/baeldung/mcp/oauth2authorizationserver/Oauth2AuthorizationServerApplication.java
rename to spring-ai-modules/spring-ai-mcp-oauth/oauth2-authorization-server/src/main/java/com/baeldung/mcp/oauth2authorizationserver/Oauth2AuthorizationServerApplication.java
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/oauth2-authorization-server/src/main/java/com/baeldung/mcp/oauth2authorizationserver/config/AuthorizationServerConfig.java b/spring-ai-modules/spring-ai-mcp-oauth/oauth2-authorization-server/src/main/java/com/baeldung/mcp/oauth2authorizationserver/config/AuthorizationServerConfig.java
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/oauth2-authorization-server/src/main/java/com/baeldung/mcp/oauth2authorizationserver/config/AuthorizationServerConfig.java
rename to spring-ai-modules/spring-ai-mcp-oauth/oauth2-authorization-server/src/main/java/com/baeldung/mcp/oauth2authorizationserver/config/AuthorizationServerConfig.java
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/oauth2-authorization-server/src/main/resources/application.yml b/spring-ai-modules/spring-ai-mcp-oauth/oauth2-authorization-server/src/main/resources/application.yml
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/oauth2-authorization-server/src/main/resources/application.yml
rename to spring-ai-modules/spring-ai-mcp-oauth/oauth2-authorization-server/src/main/resources/application.yml
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/oauth2-authorization-server/src/test/java/com/baeldung/mcp/oauth2authorizationserver/config/AuthorizationServerConfigUnitTest.java b/spring-ai-modules/spring-ai-mcp-oauth/oauth2-authorization-server/src/test/java/com/baeldung/mcp/oauth2authorizationserver/config/AuthorizationServerConfigUnitTest.java
similarity index 100%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/oauth2-authorization-server/src/test/java/com/baeldung/mcp/oauth2authorizationserver/config/AuthorizationServerConfigUnitTest.java
rename to spring-ai-modules/spring-ai-mcp-oauth/oauth2-authorization-server/src/test/java/com/baeldung/mcp/oauth2authorizationserver/config/AuthorizationServerConfigUnitTest.java
diff --git a/spring-ai-modules/spring-ai-mcp/mcp-spring/pom.xml b/spring-ai-modules/spring-ai-mcp-oauth/pom.xml
similarity index 87%
rename from spring-ai-modules/spring-ai-mcp/mcp-spring/pom.xml
rename to spring-ai-modules/spring-ai-mcp-oauth/pom.xml
index f0197fe1d1a8..4b4bcd19b7cc 100644
--- a/spring-ai-modules/spring-ai-mcp/mcp-spring/pom.xml
+++ b/spring-ai-modules/spring-ai-mcp-oauth/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>mcp-spring</artifactId>
+    <artifactId>spring-ai-mcp-oauth</artifactId>
     <packaging>pom</packaging>
-    <name>mcp-spring</name>
+    <name>spring-ai-mcp-oauth</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>spring-ai-mcp</artifactId>
+        <artifactId>spring-ai-modules</artifactId>
         <version>0.0.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>