diff --git a/src/components/base/index.ts b/src/components/base/index.ts
index e0e1afb2d..826866719 100644
--- a/src/components/base/index.ts
+++ b/src/components/base/index.ts
@@ -5,4 +5,3 @@ export { BaseLoading } from "./base-loading";
 export { BaseErrorBoundary } from "./base-error-boundary";
 export { Switch } from "./base-switch";
 export { BaseLoadingOverlay } from "./base-loading-overlay";
-export { NoticeManager } from "./NoticeManager";
diff --git a/src/components/home/enhanced-traffic-stats.tsx b/src/components/home/enhanced-traffic-stats.tsx
index 69d8e4e3f..f4079b8fb 100644
--- a/src/components/home/enhanced-traffic-stats.tsx
+++ b/src/components/home/enhanced-traffic-stats.tsx
@@ -17,7 +17,7 @@ import {
 import { ReactNode, memo, useMemo, useRef } from "react";
 import { useTranslation } from "react-i18next";
 
-import { TrafficErrorBoundary } from "@/components/common/traffic-error-boundary";
+import { TrafficErrorBoundary } from "@/components/shared/traffic-error-boundary";
 import { useConnectionData } from "@/hooks/use-connection-data";
 import { useMemoryData } from "@/hooks/use-memory-data";
 import { useTrafficData } from "@/hooks/use-traffic-data";
diff --git a/src/components/layout/layout-traffic.tsx b/src/components/layout/layout-traffic.tsx
index 8e26da04d..f95604715 100644
--- a/src/components/layout/layout-traffic.tsx
+++ b/src/components/layout/layout-traffic.tsx
@@ -7,7 +7,7 @@ import { Box, Typography } from "@mui/material";
 import { useEffect, useRef } from "react";
 import { useTranslation } from "react-i18next";
 
-import { LightweightTrafficErrorBoundary } from "@/components/common/traffic-error-boundary";
+import { LightweightTrafficErrorBoundary } from "@/components/shared/traffic-error-boundary";
 import { useMemoryData } from "@/hooks/use-memory-data";
 import { useTrafficData } from "@/hooks/use-traffic-data";
 import { useVerge } from "@/hooks/use-verge";
diff --git a/src/components/base/NoticeManager.tsx b/src/components/layout/notice-manager.tsx
similarity index 100%
rename from src/components/base/NoticeManager.tsx
rename to src/components/layout/notice-manager.tsx
diff --git a/src/components/controller/window-controller.tsx b/src/components/layout/window-controller.tsx
similarity index 100%
rename from src/components/controller/window-controller.tsx
rename to src/components/layout/window-controller.tsx
diff --git a/src/components/common/traffic-error-boundary.tsx b/src/components/shared/traffic-error-boundary.tsx
similarity index 100%
rename from src/components/common/traffic-error-boundary.tsx
rename to src/components/shared/traffic-error-boundary.tsx
diff --git a/src/components/common/with-traffic-error-boundary.tsx b/src/components/shared/with-traffic-error-boundary.tsx
similarity index 100%
rename from src/components/common/with-traffic-error-boundary.tsx
rename to src/components/shared/with-traffic-error-boundary.tsx
diff --git a/src/pages/_layout.tsx b/src/pages/_layout.tsx
index ed2bd4f87..5b77e3f9b 100644
--- a/src/pages/_layout.tsx
+++ b/src/pages/_layout.tsx
@@ -33,12 +33,11 @@ import iconDark from "@/assets/image/icon_dark.svg?react";
 import iconLight from "@/assets/image/icon_light.svg?react";
 import LogoSvg from "@/assets/image/logo.svg?react";
 import { BaseErrorBoundary } from "@/components/base";
-import { NoticeManager } from "@/components/base/NoticeManager";
-import { WindowControls } from "@/components/controller/window-controller";
 import { LayoutItem } from "@/components/layout/layout-item";
 import { LayoutTraffic } from "@/components/layout/layout-traffic";
+import { NoticeManager } from "@/components/layout/notice-manager";
 import { UpdateButton } from "@/components/layout/update-button";
-import { useCustomTheme } from "@/components/layout/use-custom-theme";
+import { WindowControls } from "@/components/layout/window-controller";
 import { useI18n } from "@/hooks/use-i18n";
 import { useVerge } from "@/hooks/use-verge";
 import { useWindowDecorations } from "@/hooks/use-window";
@@ -47,6 +46,7 @@ import getSystem from "@/utils/get-system";
 
 import {
   useAppInitialization,
+  useCustomTheme,
   useLayoutEvents,
   useLoadingOverlay,
   useNavMenuOrder,
diff --git a/src/pages/_layout/hooks/index.ts b/src/pages/_layout/hooks/index.ts
index c3cc56ef1..3fdede766 100644
--- a/src/pages/_layout/hooks/index.ts
+++ b/src/pages/_layout/hooks/index.ts
@@ -2,3 +2,4 @@ export { useAppInitialization } from "./use-app-initialization";
 export { useLayoutEvents } from "./use-layout-events";
 export { useLoadingOverlay } from "./use-loading-overlay";
 export { useNavMenuOrder } from "./use-nav-menu-order";
+export { useCustomTheme } from "./use-custom-theme";
diff --git a/src/components/layout/use-custom-theme.ts b/src/pages/_layout/hooks/use-custom-theme.ts
similarity index 100%
rename from src/components/layout/use-custom-theme.ts
rename to src/pages/_layout/hooks/use-custom-theme.ts
diff --git a/src/providers/window/index.ts b/src/providers/window/index.ts
index 609d65409..791994f9a 100644
--- a/src/providers/window/index.ts
+++ b/src/providers/window/index.ts
@@ -1,3 +1,3 @@
-export { WindowContext } from "./WindowContext";
-export type { WindowContextType } from "./WindowContext";
-export { WindowProvider } from "./WindowProvider";
+export { WindowContext } from "./window-context";
+export type { WindowContextType } from "./window-context";
+export { WindowProvider } from "./window-provider";
diff --git a/src/providers/window/WindowContext.ts b/src/providers/window/window-context.ts
similarity index 100%
rename from src/providers/window/WindowContext.ts
rename to src/providers/window/window-context.ts
diff --git a/src/providers/window/WindowProvider.tsx b/src/providers/window/window-provider.tsx
similarity index 98%
rename from src/providers/window/WindowProvider.tsx
rename to src/providers/window/window-provider.tsx
index 7fb0893ff..336331021 100644
--- a/src/providers/window/WindowProvider.tsx
+++ b/src/providers/window/window-provider.tsx
@@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useMemo, useState } from "react";
 
 import debounce from "@/utils/debounce";
 
-import { WindowContext } from "./WindowContext";
+import { WindowContext } from "./window-context";
 
 export const WindowProvider: React.FC<{ children: React.ReactNode }> = ({
   children,