diff --git a/spring-ai-core/src/main/java/org/springframework/ai/prompt/FormatProvider.java b/spring-ai-core/src/main/java/org/springframework/ai/parser/FormatProvider.java
similarity index 89%
rename from spring-ai-core/src/main/java/org/springframework/ai/prompt/FormatProvider.java
rename to spring-ai-core/src/main/java/org/springframework/ai/parser/FormatProvider.java
index 9bbb4a952..277081150 100644
--- a/spring-ai-core/src/main/java/org/springframework/ai/prompt/FormatProvider.java
+++ b/spring-ai-core/src/main/java/org/springframework/ai/parser/FormatProvider.java
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.prompt;
-
-//TODO: Shouldn't the FormatProvider be inside the parser package?
+package org.springframework.ai.parser;
 
 /**
  * Implementations of this interface provides instructions for how the output of a
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/parser/OutputParser.java b/spring-ai-core/src/main/java/org/springframework/ai/parser/OutputParser.java
index 4c8fc53c6..cbc7e6e5a 100644
--- a/spring-ai-core/src/main/java/org/springframework/ai/parser/OutputParser.java
+++ b/spring-ai-core/src/main/java/org/springframework/ai/parser/OutputParser.java
@@ -16,8 +16,6 @@
 
 package org.springframework.ai.parser;
 
-import org.springframework.ai.prompt.FormatProvider;
-
 /**
  * Converts the (raw) LLM output into a structured responses of type. The
  * {@link FormatProvider#getFormat()} method should provide the LLM prompt description of