diff --git a/extension/package.json b/extension/package.json
index 86047d9f..1006af56 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -4,8 +4,8 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "build:service_worker": "tsc -p ./src/services/tsconfig.json && TYPE=service_worker vite build",
-    "build:content_script": "tsc && TYPE=content_script vite build",
+    "build:service_worker": "TYPE=service_worker vite build",
+    "build:content_script": "TYPE=content_script vite build",
     "build": "pnpm run \"/^build:.*/\"",
     "dev:build": "pnpm run build --mode development",
     "dev:prod": "pnpm run build && concurrently --kill-others \"pnpm run build --watch\"",
diff --git a/extension/public/manifest.json b/extension/public/manifest.json
index f156d2a6..22ac8eb7 100644
--- a/extension/public/manifest.json
+++ b/extension/public/manifest.json
@@ -14,7 +14,7 @@
   "permissions": ["scripting", "tabs"],
   "content_scripts": [
     {
-      "js": ["assets/index.js"],
+      "js": ["assets/content_script.js"],
       "css": ["assets/index.css"],
       "matches": ["https://leetcode.com/problems/*"],
       "run_at": "document_end"
diff --git a/extension/src/App.tsx b/extension/src/App.tsx
deleted file mode 100644
index 89731384..00000000
--- a/extension/src/App.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import RootNavigator from "@cb/components/navigator/RootNavigator";
-import { AppPanel } from "@cb/components/panel";
-import { Toaster } from "sonner";
-import SessionProvider from "./context/SessionProvider";
-import { WindowProvider } from "./context/WindowProvider";
-
-const App = () => {
-  return (
-    <WindowProvider>
-      <Toaster
-        richColors
-        expand
-        closeButton
-        visibleToasts={3}
-        toastOptions={{
-          duration: 5 * 1000,
-        }}
-      />
-      <AppPanel>
-        <SessionProvider>
-          <RootNavigator />
-        </SessionProvider>
-      </AppPanel>
-    </WindowProvider>
-  );
-};
-
-export default App;
diff --git a/extension/src/index.tsx b/extension/src/main/content_script.tsx
similarity index 51%
rename from extension/src/index.tsx
rename to extension/src/main/content_script.tsx
index c6b89a37..a0923c0b 100644
--- a/extension/src/index.tsx
+++ b/extension/src/main/content_script.tsx
@@ -1,9 +1,13 @@
+import RootNavigator from "@cb/components/navigator/RootNavigator";
+import { AppPanel } from "@cb/components/panel";
+import SessionProvider from "@cb/context/SessionProvider";
+import { WindowProvider } from "@cb/context/WindowProvider";
+import "@cb/style/index.css";
 import { generateId, waitForElement } from "@cb/utils";
 import React from "react";
 import { createRoot } from "react-dom/client";
 import "react-resizable/css/styles.css";
-import App from "./App";
-import "./style/index.css";
+import { Toaster } from "sonner";
 
 const TIME_OUT = 5000; // ms
 const LEETCODE_ROOT_ID = "#qd-content";
@@ -15,7 +19,22 @@ waitForElement(LEETCODE_ROOT_ID, TIME_OUT)
     leetCodeNode.insertAdjacentElement("afterend", extensionRoot);
     createRoot(extensionRoot).render(
       <React.StrictMode>
-        <App />
+        <WindowProvider>
+          <Toaster
+            richColors
+            expand
+            closeButton
+            visibleToasts={3}
+            toastOptions={{
+              duration: 5 * 1000,
+            }}
+          />
+          <AppPanel>
+            <SessionProvider>
+              <RootNavigator />
+            </SessionProvider>
+          </AppPanel>
+        </WindowProvider>
       </React.StrictMode>
     );
   })
diff --git a/extension/src/services/background.spec.ts b/extension/src/main/service_worker/background.spec.ts
similarity index 100%
rename from extension/src/services/background.spec.ts
rename to extension/src/main/service_worker/background.spec.ts
diff --git a/extension/src/services/background.ts b/extension/src/main/service_worker/background.ts
similarity index 100%
rename from extension/src/services/background.ts
rename to extension/src/main/service_worker/background.ts
diff --git a/extension/src/services/tsconfig.json b/extension/src/services/tsconfig.json
deleted file mode 100644
index ef27a5dd..00000000
--- a/extension/src/services/tsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "ES2020",
-    "lib": ["WebWorker", "ES2015", "DOM"],
-
-    /* Bundler mode */
-    "moduleResolution": "Node"
-  },
-  "include": ["./**/*.ts"],
-  "exclude": [],
-  "extends": "../../tsconfig.json"
-}
diff --git a/extension/vite.config.ts b/extension/vite.config.ts
index 1f39a237..b8148341 100644
--- a/extension/vite.config.ts
+++ b/extension/vite.config.ts
@@ -10,9 +10,9 @@ export default defineConfig(() => {
   // https://github.com/vitejs/vite/issues/12203
   const input =
     process.env.TYPE === "content_script"
-      ? "./src/index.tsx"
+      ? "./src/main/content_script.tsx"
       : process.env.TYPE === "service_worker"
-        ? "./src/services/background.ts"
+        ? "./src/main/service_worker/background.ts"
         : null;
   const devScriptHint = `./dist/${process.env.TYPE}`;