diff --git a/app/(customer)/dashboard/layout.tsx b/app/(customer)/dashboard/layout.tsx
index ce78a87e..ecee836e 100644
--- a/app/(customer)/dashboard/layout.tsx
+++ b/app/(customer)/dashboard/layout.tsx
@@ -7,7 +7,7 @@ import { Header } from "@/features/layout/components/header";
 import { currentUser } from "@/lib/auth/current-user";
 import { isOnboardingDone } from "@/db/services/setting";
 import { env } from "@/env.mjs";
-import { ModeToggle } from "@/features/theme/mode-toggle";
+import { ModeToggle } from "@/features/theme/components/mode-toggle";
 import { UpdateNotification } from "@/features/updates/update-notification";
 
 export default async function Layout({ children }: { children: ReactNode }) {
diff --git a/app/providers.tsx b/app/providers.tsx
index f9f14232..9cf4080e 100644
--- a/app/providers.tsx
+++ b/app/providers.tsx
@@ -5,8 +5,8 @@ import { type PropsWithChildren, Suspense } from "react";
 
 import { Toaster } from "@/components/ui/sonner";
 import { ErrorLayout } from "@/components/common/error-layout";
-import { ThemeMetaUpdater } from "@/features/theme/theme-meta-updater";
-import { ThemeProvider } from "@/features/theme/theme-provider";
+import { ThemeMetaUpdater } from "@/features/theme/components/theme-meta-updater";
+import { ThemeProvider } from "@/features/theme/components/theme-provider";
 
 export type ProviderProps = PropsWithChildren<{}>;
 const queryClient = new QueryClient();
diff --git a/src/features/theme/mode-toggle.tsx b/src/features/theme/components/mode-toggle.tsx
similarity index 100%
rename from src/features/theme/mode-toggle.tsx
rename to src/features/theme/components/mode-toggle.tsx
diff --git a/src/features/theme/theme-meta-updater-root.tsx b/src/features/theme/components/theme-meta-updater-root.tsx
similarity index 100%
rename from src/features/theme/theme-meta-updater-root.tsx
rename to src/features/theme/components/theme-meta-updater-root.tsx
diff --git a/src/features/theme/theme-meta-updater.tsx b/src/features/theme/components/theme-meta-updater.tsx
similarity index 100%
rename from src/features/theme/theme-meta-updater.tsx
rename to src/features/theme/components/theme-meta-updater.tsx
diff --git a/src/features/theme/theme-provider.tsx b/src/features/theme/components/theme-provider.tsx
similarity index 100%
rename from src/features/theme/theme-provider.tsx
rename to src/features/theme/components/theme-provider.tsx