diff --git a/src/core/assistant-message/DirectiveHandler.ts b/src/core/message-parsing/DirectiveHandler.ts
similarity index 100%
rename from src/core/assistant-message/DirectiveHandler.ts
rename to src/core/message-parsing/DirectiveHandler.ts
diff --git a/src/core/assistant-message/DirectiveHandlerRegistry.ts b/src/core/message-parsing/DirectiveHandlerRegistry.ts
similarity index 100%
rename from src/core/assistant-message/DirectiveHandlerRegistry.ts
rename to src/core/message-parsing/DirectiveHandlerRegistry.ts
diff --git a/src/core/assistant-message/DirectiveRegistryFactory.ts b/src/core/message-parsing/DirectiveRegistryFactory.ts
similarity index 100%
rename from src/core/assistant-message/DirectiveRegistryFactory.ts
rename to src/core/message-parsing/DirectiveRegistryFactory.ts
diff --git a/src/core/assistant-message/DirectiveStreamingParser.ts b/src/core/message-parsing/DirectiveStreamingParser.ts
similarity index 100%
rename from src/core/assistant-message/DirectiveStreamingParser.ts
rename to src/core/message-parsing/DirectiveStreamingParser.ts
diff --git a/src/core/assistant-message/FallbackParser.ts b/src/core/message-parsing/FallbackParser.ts
similarity index 100%
rename from src/core/assistant-message/FallbackParser.ts
rename to src/core/message-parsing/FallbackParser.ts
diff --git a/src/core/assistant-message/ParseContext.ts b/src/core/message-parsing/ParseContext.ts
similarity index 100%
rename from src/core/assistant-message/ParseContext.ts
rename to src/core/message-parsing/ParseContext.ts
diff --git a/src/core/assistant-message/ParsingState.ts b/src/core/message-parsing/ParsingState.ts
similarity index 100%
rename from src/core/assistant-message/ParsingState.ts
rename to src/core/message-parsing/ParsingState.ts
diff --git a/src/core/assistant-message/XmlUtils.ts b/src/core/message-parsing/XmlUtils.ts
similarity index 100%
rename from src/core/assistant-message/XmlUtils.ts
rename to src/core/message-parsing/XmlUtils.ts
diff --git a/src/core/assistant-message/__tests__/DirectiveStreamingParser.spec.ts b/src/core/message-parsing/__tests__/DirectiveStreamingParser.spec.ts
similarity index 100%
rename from src/core/assistant-message/__tests__/DirectiveStreamingParser.spec.ts
rename to src/core/message-parsing/__tests__/DirectiveStreamingParser.spec.ts
diff --git a/src/core/assistant-message/__tests__/DirectiveStreamingParser.test.ts b/src/core/message-parsing/__tests__/DirectiveStreamingParser.test.ts
similarity index 100%
rename from src/core/assistant-message/__tests__/DirectiveStreamingParser.test.ts
rename to src/core/message-parsing/__tests__/DirectiveStreamingParser.test.ts
diff --git a/src/core/assistant-message/__tests__/log-message.spec.ts b/src/core/message-parsing/__tests__/log-message.spec.ts
similarity index 100%
rename from src/core/assistant-message/__tests__/log-message.spec.ts
rename to src/core/message-parsing/__tests__/log-message.spec.ts
diff --git a/src/core/assistant-message/__tests__/parseAssistantMessage.test.ts b/src/core/message-parsing/__tests__/parseAssistantMessage.test.ts
similarity index 100%
rename from src/core/assistant-message/__tests__/parseAssistantMessage.test.ts
rename to src/core/message-parsing/__tests__/parseAssistantMessage.test.ts
diff --git a/src/core/assistant-message/__tests__/parseAssistantMessageBenchmark.ts b/src/core/message-parsing/__tests__/parseAssistantMessageBenchmark.ts
similarity index 100%
rename from src/core/assistant-message/__tests__/parseAssistantMessageBenchmark.ts
rename to src/core/message-parsing/__tests__/parseAssistantMessageBenchmark.ts
diff --git a/src/core/assistant-message/directives/logDirective.ts b/src/core/message-parsing/directives/LogDirective.ts
similarity index 100%
rename from src/core/assistant-message/directives/logDirective.ts
rename to src/core/message-parsing/directives/LogDirective.ts
diff --git a/src/core/assistant-message/directives/textDirective.ts b/src/core/message-parsing/directives/TextDirective.ts
similarity index 100%
rename from src/core/assistant-message/directives/textDirective.ts
rename to src/core/message-parsing/directives/TextDirective.ts
diff --git a/src/core/assistant-message/directives/index.ts b/src/core/message-parsing/directives/index.ts
similarity index 100%
rename from src/core/assistant-message/directives/index.ts
rename to src/core/message-parsing/directives/index.ts
diff --git a/src/core/assistant-message/handlers/BaseDirectiveHandler.ts b/src/core/message-parsing/handlers/BaseDirectiveHandler.ts
similarity index 100%
rename from src/core/assistant-message/handlers/BaseDirectiveHandler.ts
rename to src/core/message-parsing/handlers/BaseDirectiveHandler.ts
diff --git a/src/core/assistant-message/handlers/LogDirectiveHandler.ts b/src/core/message-parsing/handlers/LogDirectiveHandler.ts
similarity index 100%
rename from src/core/assistant-message/handlers/LogDirectiveHandler.ts
rename to src/core/message-parsing/handlers/LogDirectiveHandler.ts
diff --git a/src/core/assistant-message/handlers/TextDirectiveHandler.ts b/src/core/message-parsing/handlers/TextDirectiveHandler.ts
similarity index 100%
rename from src/core/assistant-message/handlers/TextDirectiveHandler.ts
rename to src/core/message-parsing/handlers/TextDirectiveHandler.ts
diff --git a/src/core/assistant-message/handlers/ToolDirectiveHandler.ts b/src/core/message-parsing/handlers/ToolDirectiveHandler.ts
similarity index 100%
rename from src/core/assistant-message/handlers/ToolDirectiveHandler.ts
rename to src/core/message-parsing/handlers/ToolDirectiveHandler.ts
diff --git a/src/core/assistant-message/handlers/index.ts b/src/core/message-parsing/handlers/index.ts
similarity index 100%
rename from src/core/assistant-message/handlers/index.ts
rename to src/core/message-parsing/handlers/index.ts
diff --git a/src/core/assistant-message/index.ts b/src/core/message-parsing/index.ts
similarity index 100%
rename from src/core/assistant-message/index.ts
rename to src/core/message-parsing/index.ts
diff --git a/src/core/assistant-message/parseAssistantMessage.ts b/src/core/message-parsing/parseAssistantMessage.ts
similarity index 100%
rename from src/core/assistant-message/parseAssistantMessage.ts
rename to src/core/message-parsing/parseAssistantMessage.ts
diff --git a/src/core/assistant-message/parseAssistantMessageV2.ts b/src/core/message-parsing/parseAssistantMessageV2.ts
similarity index 100%
rename from src/core/assistant-message/parseAssistantMessageV2.ts
rename to src/core/message-parsing/parseAssistantMessageV2.ts
diff --git a/src/core/assistant-message/presentAssistantMessage.ts b/src/core/message-parsing/presentAssistantMessage.ts
similarity index 100%
rename from src/core/assistant-message/presentAssistantMessage.ts
rename to src/core/message-parsing/presentAssistantMessage.ts