diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index bbd55f5..afca272 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -26,6 +26,7 @@ import { useAppStore } from "./store/app-store";
 import { useProjectStore } from "./store/project-store";
 import Sidebar from "./components/sidebar/Sidebar";
 import Preview from "./components/preview/Preview";
+import DeprecationMessage from "./components/messages/DeprecationMessage";
 
 function App() {
   const {
@@ -397,14 +398,8 @@ function App() {
             }
           />
 
-          {showBetterModelMessage && (
-            <div className="rounded-lg p-2 bg-fuchsia-200">
-              <p className="text-gray-800 text-sm">
-                We no longer support this model. Instead, code generation will
-                use GPT-4o or Claude Sonnet 3.5, the 2 state-of-the-art models.
-              </p>
-            </div>
-          )}
+          {/* Show auto updated message when older models are choosen */}
+          {showBetterModelMessage && <DeprecationMessage />}
 
           {appState !== AppState.CODE_READY && <TipLink />}
 
diff --git a/frontend/src/components/messages/DeprecationMessage.tsx b/frontend/src/components/messages/DeprecationMessage.tsx
new file mode 100644
index 0000000..840d401
--- /dev/null
+++ b/frontend/src/components/messages/DeprecationMessage.tsx
@@ -0,0 +1,16 @@
+import React from "react";
+
+interface DeprecationMessageProps {}
+
+const DeprecationMessage: React.FC<DeprecationMessageProps> = () => {
+  return (
+    <div className="rounded-lg p-2 bg-fuchsia-200">
+      <p className="text-gray-800 text-sm">
+        We no longer support this model. Instead, code generation will use
+        GPT-4o or Claude Sonnet 3.5, the 2 state-of-the-art models.
+      </p>
+    </div>
+  );
+};
+
+export default DeprecationMessage;
diff --git a/frontend/src/components/CodeMirror.tsx b/frontend/src/components/preview/CodeMirror.tsx
similarity index 100%
rename from frontend/src/components/CodeMirror.tsx
rename to frontend/src/components/preview/CodeMirror.tsx
diff --git a/frontend/src/components/CodePreview.tsx b/frontend/src/components/preview/CodePreview.tsx
similarity index 100%
rename from frontend/src/components/CodePreview.tsx
rename to frontend/src/components/preview/CodePreview.tsx
diff --git a/frontend/src/components/CodeTab.tsx b/frontend/src/components/preview/CodeTab.tsx
similarity index 97%
rename from frontend/src/components/CodeTab.tsx
rename to frontend/src/components/preview/CodeTab.tsx
index d10f649..378d761 100644
--- a/frontend/src/components/CodeTab.tsx
+++ b/frontend/src/components/preview/CodeTab.tsx
@@ -1,7 +1,7 @@
 import { FaCopy } from "react-icons/fa";
 import CodeMirror from "./CodeMirror";
-import { Button } from "./ui/button";
-import { Settings } from "../types";
+import { Button } from "../ui/button";
+import { Settings } from "../../types";
 import copy from "copy-to-clipboard";
 import { useCallback } from "react";
 import toast from "react-hot-toast";
diff --git a/frontend/src/components/preview/Preview.tsx b/frontend/src/components/preview/Preview.tsx
index 118e855..8fe3061 100644
--- a/frontend/src/components/preview/Preview.tsx
+++ b/frontend/src/components/preview/Preview.tsx
@@ -7,7 +7,7 @@ import {
   FaCode,
 } from "react-icons/fa";
 import { AppState, Settings } from "../../types";
-import CodeTab from "../CodeTab";
+import CodeTab from "./CodeTab";
 import { Button } from "../ui/button";
 import { useAppStore } from "../../store/app-store";
 import { useProjectStore } from "../../store/project-store";
diff --git a/frontend/src/components/sidebar/Sidebar.tsx b/frontend/src/components/sidebar/Sidebar.tsx
index f8ba3c4..a92c77f 100644
--- a/frontend/src/components/sidebar/Sidebar.tsx
+++ b/frontend/src/components/sidebar/Sidebar.tsx
@@ -3,7 +3,7 @@ import classNames from "classnames";
 import { useAppStore } from "../../store/app-store";
 import { useProjectStore } from "../../store/project-store";
 import { AppState } from "../../types";
-import CodePreview from "../CodePreview";
+import CodePreview from "../preview/CodePreview";
 import Spinner from "../Spinner";
 import KeyboardShortcutBadge from "../core/KeyboardShortcutBadge";
 import TipLink from "../core/TipLink";