diff --git a/spring-ai/postman/chat-client.http b/spring-ai-3/postman/chat-client.http
similarity index 100%
rename from spring-ai/postman/chat-client.http
rename to spring-ai-3/postman/chat-client.http
diff --git a/spring-ai/src/main/java/com/baeldung/springai/chatclient/ChatClientApplication.java b/spring-ai-3/src/main/java/com/baeldung/springai/chatclient/ChatClientApplication.java
similarity index 100%
rename from spring-ai/src/main/java/com/baeldung/springai/chatclient/ChatClientApplication.java
rename to spring-ai-3/src/main/java/com/baeldung/springai/chatclient/ChatClientApplication.java
diff --git a/spring-ai-3/src/main/resources/application.yml b/spring-ai-3/src/main/resources/application.yml
index 4253acbbeb4d..38201bb8fc8e 100644
--- a/spring-ai-3/src/main/resources/application.yml
+++ b/spring-ai-3/src/main/resources/application.yml
@@ -5,3 +5,8 @@ spring:
       chat:
         options:
           model: mistral-small-latest
+    openai:
+      api-key: xxxx
+      chat.enabled: true
+      embedding.enabled: true
+      chat.options.model: gpt-4o
diff --git a/spring-ai/src/main/resources/articles.txt b/spring-ai-3/src/main/resources/articles.txt
similarity index 100%
rename from spring-ai/src/main/resources/articles.txt
rename to spring-ai-3/src/main/resources/articles.txt
diff --git a/spring-ai/src/main/resources/application.yml b/spring-ai/src/main/resources/application.yml
index 638a098bfb2e..d23cae9207a9 100644
--- a/spring-ai/src/main/resources/application.yml
+++ b/spring-ai/src/main/resources/application.yml
@@ -1,10 +1,5 @@
 spring:
   ai:
-    openai:
-      api-key: xxxx
-      chat.enabled: true
-      embedding.enabled: true
-      chat.options.model: gpt-4o
     mistralai:
       api-key: ${MISTRAL_AI_API_KEY}
       chat: