diff --git a/src/lib/components/chat/Messages/HTMLRenderer.svelte b/src/lib/components/chat/Messages/HTMLRenderer.svelte
deleted file mode 100644
index 53fad8084..000000000
--- a/src/lib/components/chat/Messages/HTMLRenderer.svelte
+++ /dev/null
@@ -1,30 +0,0 @@
-<script lang="ts">
-	import Image from '$lib/components/common/Image.svelte';
-	import CodeBlock from './CodeBlock.svelte';
-
-	/* The html content of the tag */
-	export let html; //: string;
-	let parsedHTML = [html];
-
-	export let images;
-	export let codes;
-
-	//  all images are in {{IMAGE_0}}, {{IMAGE_1}}....  format
-	// all codes are in {{CODE_0}}, {{CODE_1}}....  format
-
-	const rules = [];
-	rules.forEach((rule) => {
-		parsedHTML = parsedHTML.map((substr) => substr.split(rule.regex)).flat();
-	});
-</script>
-
-{#each parsedHTML as part}
-	{@const match = rules.find((rule) => rule.regex.test(part))}
-	{#if match}
-		<svelte:component this={match.component} {...match.props}>
-			{@html part}
-		</svelte:component>
-	{:else}
-		{@html part}
-	{/if}
-{/each}
diff --git a/src/lib/components/chat/Messages/KatexRenderer.svelte b/src/lib/components/chat/Messages/Markdown/KatexRenderer.svelte
similarity index 100%
rename from src/lib/components/chat/Messages/KatexRenderer.svelte
rename to src/lib/components/chat/Messages/Markdown/KatexRenderer.svelte
diff --git a/src/lib/components/chat/Messages/MarkdownInlineTokens.svelte b/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens.svelte
similarity index 100%
rename from src/lib/components/chat/Messages/MarkdownInlineTokens.svelte
rename to src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens.svelte
diff --git a/src/lib/components/chat/Messages/MarkdownTokens.svelte b/src/lib/components/chat/Messages/Markdown/MarkdownTokens.svelte
similarity index 99%
rename from src/lib/components/chat/Messages/MarkdownTokens.svelte
rename to src/lib/components/chat/Messages/Markdown/MarkdownTokens.svelte
index e51dcc2ee..32f9046b1 100644
--- a/src/lib/components/chat/Messages/MarkdownTokens.svelte
+++ b/src/lib/components/chat/Messages/Markdown/MarkdownTokens.svelte
@@ -5,7 +5,7 @@
 	import { revertSanitizedResponseContent, unescapeHtml } from '$lib/utils';
 
 	import CodeBlock from '$lib/components/chat/Messages/CodeBlock.svelte';
-	import MarkdownInlineTokens from '$lib/components/chat/Messages/MarkdownInlineTokens.svelte';
+	import MarkdownInlineTokens from '$lib/components/chat/Messages/Markdown/MarkdownInlineTokens.svelte';
 	import KatexRenderer from './KatexRenderer.svelte';
 	import { WEBUI_BASE_URL } from '$lib/constants';
 
diff --git a/src/lib/components/chat/Messages/ResponseMessage.svelte b/src/lib/components/chat/Messages/ResponseMessage.svelte
index 79b51c8d2..fa166853a 100644
--- a/src/lib/components/chat/Messages/ResponseMessage.svelte
+++ b/src/lib/components/chat/Messages/ResponseMessage.svelte
@@ -33,7 +33,7 @@
 	import Spinner from '$lib/components/common/Spinner.svelte';
 	import WebSearchResults from './ResponseMessage/WebSearchResults.svelte';
 	import Sparkles from '$lib/components/icons/Sparkles.svelte';
-	import MarkdownTokens from './MarkdownTokens.svelte';
+	import MarkdownTokens from './Markdown/MarkdownTokens.svelte';
 
 	export let message;
 	export let siblings;
diff --git a/src/lib/components/chat/Messages/UserMessage.svelte b/src/lib/components/chat/Messages/UserMessage.svelte
index b18c1bd8d..11d14523f 100644
--- a/src/lib/components/chat/Messages/UserMessage.svelte
+++ b/src/lib/components/chat/Messages/UserMessage.svelte
@@ -12,7 +12,7 @@
 	import FileItem from '$lib/components/common/FileItem.svelte';
 	import { marked } from 'marked';
 	import { processResponseContent, replaceTokens } from '$lib/utils';
-	import MarkdownTokens from './MarkdownTokens.svelte';
+	import MarkdownTokens from './Markdown/MarkdownTokens.svelte';
 
 	const i18n = getContext('i18n');