diff --git a/src/views/CurrentMessage.tsx b/src/views/CurrentMessage.tsx
index caf7fc0..7ebc412 100644
--- a/src/views/CurrentMessage.tsx
+++ b/src/views/CurrentMessage.tsx
@@ -3,7 +3,7 @@ import React, { useEffect } from "react";
 import { keyframes } from "@emotion/react";
 import { Container, Text } from "@mantine/core";
 import { useAppDispatch, useAppSelector } from '@/views/hooks';
-import CodeBlock from "@/views/CodeBlock";
+import CodeBlock from "@/views/components/CodeBlock";
 
 import {
     newMessage,
diff --git a/src/views/MessageContainer.tsx b/src/views/MessageContainer.tsx
index e2d84eb..df80aa0 100644
--- a/src/views/MessageContainer.tsx
+++ b/src/views/MessageContainer.tsx
@@ -1,7 +1,7 @@
 
 import { Center, Text, Accordion, Box, Stack, Container, Divider } from "@mantine/core";
 import React from "react";
-import CodeBlock from "@/views/CodeBlock";
+import CodeBlock from "@/views/components/CodeBlock";
 import MessageHeader from "@/views/MessageHeader";
 
 import { useAppSelector } from '@/views/hooks';
diff --git a/src/views/CodeButtons.tsx b/src/views/components/CodeBlock/CodeButtons.tsx
similarity index 100%
rename from src/views/CodeButtons.tsx
rename to src/views/components/CodeBlock/CodeButtons.tsx
diff --git a/src/views/CodeBlock.tsx b/src/views/components/CodeBlock/index.tsx
similarity index 98%
rename from src/views/CodeBlock.tsx
rename to src/views/components/CodeBlock/index.tsx
index ea118fd..3c3c0be 100644
--- a/src/views/CodeBlock.tsx
+++ b/src/views/components/CodeBlock/index.tsx
@@ -3,7 +3,7 @@ import React from "react";
 import ReactMarkdown from "react-markdown";
 import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
 import { okaidia } from "react-syntax-highlighter/dist/esm/styles/prism";
-import CodeButtons from "@/views/CodeButtons";
+import CodeButtons from "./CodeButtons";
 
 const CodeBlock = (props: any) => {
     const { messageText, messageType } = props;