diff --git a/yudao-ui-admin-vue3/src/layout/Layout.vue b/yudao-ui-admin-vue3/src/layout/Layout.vue
index 9d34f2a09..5c43e52d0 100644
--- a/yudao-ui-admin-vue3/src/layout/Layout.vue
+++ b/yudao-ui-admin-vue3/src/layout/Layout.vue
@@ -2,7 +2,7 @@
 import { computed, defineComponent, unref } from 'vue'
 import { useAppStore } from '@/store/modules/app'
 import { Backtop } from '@/components/Backtop'
-import { Setting } from '@/components/Setting'
+import { Setting } from '@/layout/components/Setting'
 import { useRenderLayout } from './components/useRenderLayout'
 import { useDesign } from '@/hooks/web/useDesign'
 
diff --git a/yudao-ui-admin-vue3/src/layout/components/AppView.vue b/yudao-ui-admin-vue3/src/layout/components/AppView.vue
index 2000ca977..6f33a07a4 100644
--- a/yudao-ui-admin-vue3/src/layout/components/AppView.vue
+++ b/yudao-ui-admin-vue3/src/layout/components/AppView.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { useAppStore } from '@/store/modules/app'
-import { Footer } from '@/components/Footer'
+import { Footer } from '@/layout/components/Footer'
 import { computed } from 'vue'
 
 const appStore = useAppStore()
diff --git a/yudao-ui-admin-vue3/src/components/Breadcrumb/index.ts b/yudao-ui-admin-vue3/src/layout/components/Breadcrumb/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Breadcrumb/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/Breadcrumb/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/Breadcrumb/src/Breadcrumb.vue b/yudao-ui-admin-vue3/src/layout/components/Breadcrumb/src/Breadcrumb.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Breadcrumb/src/Breadcrumb.vue
rename to yudao-ui-admin-vue3/src/layout/components/Breadcrumb/src/Breadcrumb.vue
diff --git a/yudao-ui-admin-vue3/src/components/Breadcrumb/src/helper.ts b/yudao-ui-admin-vue3/src/layout/components/Breadcrumb/src/helper.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Breadcrumb/src/helper.ts
rename to yudao-ui-admin-vue3/src/layout/components/Breadcrumb/src/helper.ts
diff --git a/yudao-ui-admin-vue3/src/components/Collapse/index.ts b/yudao-ui-admin-vue3/src/layout/components/Collapse/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Collapse/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/Collapse/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/Collapse/src/Collapse.vue b/yudao-ui-admin-vue3/src/layout/components/Collapse/src/Collapse.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Collapse/src/Collapse.vue
rename to yudao-ui-admin-vue3/src/layout/components/Collapse/src/Collapse.vue
diff --git a/yudao-ui-admin-vue3/src/components/ContextMenu/index.ts b/yudao-ui-admin-vue3/src/layout/components/ContextMenu/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/ContextMenu/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/ContextMenu/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue b/yudao-ui-admin-vue3/src/layout/components/ContextMenu/src/ContextMenu.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue
rename to yudao-ui-admin-vue3/src/layout/components/ContextMenu/src/ContextMenu.vue
diff --git a/yudao-ui-admin-vue3/src/components/Footer/index.ts b/yudao-ui-admin-vue3/src/layout/components/Footer/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Footer/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/Footer/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/Footer/src/Footer.vue b/yudao-ui-admin-vue3/src/layout/components/Footer/src/Footer.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Footer/src/Footer.vue
rename to yudao-ui-admin-vue3/src/layout/components/Footer/src/Footer.vue
diff --git a/yudao-ui-admin-vue3/src/components/LocaleDropdown/index.ts b/yudao-ui-admin-vue3/src/layout/components/LocaleDropdown/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/LocaleDropdown/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/LocaleDropdown/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/LocaleDropdown/src/LocaleDropdown.vue b/yudao-ui-admin-vue3/src/layout/components/LocaleDropdown/src/LocaleDropdown.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/LocaleDropdown/src/LocaleDropdown.vue
rename to yudao-ui-admin-vue3/src/layout/components/LocaleDropdown/src/LocaleDropdown.vue
diff --git a/yudao-ui-admin-vue3/src/components/Logo/index.ts b/yudao-ui-admin-vue3/src/layout/components/Logo/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Logo/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/Logo/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/Logo/src/Logo.vue b/yudao-ui-admin-vue3/src/layout/components/Logo/src/Logo.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Logo/src/Logo.vue
rename to yudao-ui-admin-vue3/src/layout/components/Logo/src/Logo.vue
diff --git a/yudao-ui-admin-vue3/src/components/Menu/index.ts b/yudao-ui-admin-vue3/src/layout/components/Menu/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Menu/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/Menu/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/Menu/src/Menu.vue b/yudao-ui-admin-vue3/src/layout/components/Menu/src/Menu.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Menu/src/Menu.vue
rename to yudao-ui-admin-vue3/src/layout/components/Menu/src/Menu.vue
diff --git a/yudao-ui-admin-vue3/src/components/Menu/src/components/useRenderMenuItem.tsx b/yudao-ui-admin-vue3/src/layout/components/Menu/src/components/useRenderMenuItem.tsx
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Menu/src/components/useRenderMenuItem.tsx
rename to yudao-ui-admin-vue3/src/layout/components/Menu/src/components/useRenderMenuItem.tsx
diff --git a/yudao-ui-admin-vue3/src/components/Menu/src/components/useRenderMenuTitle.tsx b/yudao-ui-admin-vue3/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Menu/src/components/useRenderMenuTitle.tsx
rename to yudao-ui-admin-vue3/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx
diff --git a/yudao-ui-admin-vue3/src/components/Menu/src/helper.ts b/yudao-ui-admin-vue3/src/layout/components/Menu/src/helper.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Menu/src/helper.ts
rename to yudao-ui-admin-vue3/src/layout/components/Menu/src/helper.ts
diff --git a/yudao-ui-admin-vue3/src/components/Screenfull/index.ts b/yudao-ui-admin-vue3/src/layout/components/Screenfull/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Screenfull/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/Screenfull/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/Screenfull/src/Screenfull.vue b/yudao-ui-admin-vue3/src/layout/components/Screenfull/src/Screenfull.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Screenfull/src/Screenfull.vue
rename to yudao-ui-admin-vue3/src/layout/components/Screenfull/src/Screenfull.vue
diff --git a/yudao-ui-admin-vue3/src/components/Setting/index.ts b/yudao-ui-admin-vue3/src/layout/components/Setting/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Setting/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/Setting/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue b/yudao-ui-admin-vue3/src/layout/components/Setting/src/Setting.vue
similarity index 99%
rename from yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue
rename to yudao-ui-admin-vue3/src/layout/components/Setting/src/Setting.vue
index 9cad96d91..ac3f13aff 100644
--- a/yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue
+++ b/yudao-ui-admin-vue3/src/layout/components/Setting/src/Setting.vue
@@ -9,7 +9,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import { trim, setCssVar } from '@/utils'
 import { colorIsDark, lighten, hexToRGB } from '@/utils/color'
 import { useAppStore } from '@/store/modules/app'
-import { ThemeSwitch } from '@/components/ThemeSwitch'
+import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
 import ColorRadioPicker from './components/ColorRadioPicker.vue'
 import InterfaceDisplay from './components/InterfaceDisplay.vue'
 import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
diff --git a/yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue b/yudao-ui-admin-vue3/src/layout/components/Setting/src/components/ColorRadioPicker.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue
rename to yudao-ui-admin-vue3/src/layout/components/Setting/src/components/ColorRadioPicker.vue
diff --git a/yudao-ui-admin-vue3/src/components/Setting/src/components/InterfaceDisplay.vue b/yudao-ui-admin-vue3/src/layout/components/Setting/src/components/InterfaceDisplay.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Setting/src/components/InterfaceDisplay.vue
rename to yudao-ui-admin-vue3/src/layout/components/Setting/src/components/InterfaceDisplay.vue
diff --git a/yudao-ui-admin-vue3/src/components/Setting/src/components/LayoutRadioPicker.vue b/yudao-ui-admin-vue3/src/layout/components/Setting/src/components/LayoutRadioPicker.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/Setting/src/components/LayoutRadioPicker.vue
rename to yudao-ui-admin-vue3/src/layout/components/Setting/src/components/LayoutRadioPicker.vue
diff --git a/yudao-ui-admin-vue3/src/components/SizeDropdown/index.ts b/yudao-ui-admin-vue3/src/layout/components/SizeDropdown/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/SizeDropdown/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/SizeDropdown/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/SizeDropdown/src/SizeDropdown.vue b/yudao-ui-admin-vue3/src/layout/components/SizeDropdown/src/SizeDropdown.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/SizeDropdown/src/SizeDropdown.vue
rename to yudao-ui-admin-vue3/src/layout/components/SizeDropdown/src/SizeDropdown.vue
diff --git a/yudao-ui-admin-vue3/src/components/TabMenu/index.ts b/yudao-ui-admin-vue3/src/layout/components/TabMenu/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/TabMenu/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/TabMenu/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue b/yudao-ui-admin-vue3/src/layout/components/TabMenu/src/TabMenu.vue
similarity index 99%
rename from yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue
rename to yudao-ui-admin-vue3/src/layout/components/TabMenu/src/TabMenu.vue
index f70ee9402..0e5b69081 100644
--- a/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue
+++ b/yudao-ui-admin-vue3/src/layout/components/TabMenu/src/TabMenu.vue
@@ -5,7 +5,7 @@ import { computed, unref, defineComponent, watch, ref, onMounted } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { ElScrollbar } from 'element-plus'
 import { Icon } from '@/components/Icon'
-import { Menu } from '@/components/Menu'
+import { Menu } from '@/layout/components/Menu'
 import { useRouter } from 'vue-router'
 import { pathResolve } from '@/utils/routerHelper'
 import { cloneDeep } from 'lodash-es'
diff --git a/yudao-ui-admin-vue3/src/components/TabMenu/src/helper.ts b/yudao-ui-admin-vue3/src/layout/components/TabMenu/src/helper.ts
similarity index 94%
rename from yudao-ui-admin-vue3/src/components/TabMenu/src/helper.ts
rename to yudao-ui-admin-vue3/src/layout/components/TabMenu/src/helper.ts
index 221313379..37a1a6869 100644
--- a/yudao-ui-admin-vue3/src/components/TabMenu/src/helper.ts
+++ b/yudao-ui-admin-vue3/src/layout/components/TabMenu/src/helper.ts
@@ -1,4 +1,4 @@
-import { getAllParentPath } from '@/components/Menu/src/helper'
+import { getAllParentPath } from '@/layout/components/Menu/src/helper'
 import type { RouteMeta } from 'vue-router'
 import { isUrl } from '@/utils/is'
 import { cloneDeep } from 'lodash-es'
diff --git a/yudao-ui-admin-vue3/src/components/TagsView/index.ts b/yudao-ui-admin-vue3/src/layout/components/TagsView/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/TagsView/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/TagsView/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/TagsView/src/TagsView.vue b/yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue
similarity index 99%
rename from yudao-ui-admin-vue3/src/components/TagsView/src/TagsView.vue
rename to yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue
index aa5a52f20..dc5570f3f 100644
--- a/yudao-ui-admin-vue3/src/components/TagsView/src/TagsView.vue
+++ b/yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue
@@ -7,7 +7,7 @@ import { useTagsViewStore } from '@/store/modules/tagsView'
 import { useAppStore } from '@/store/modules/app'
 import { useI18n } from '@/hooks/web/useI18n'
 import { filterAffixTags } from './helper'
-import { ContextMenu, ContextMenuExpose } from '@/components/ContextMenu'
+import { ContextMenu, ContextMenuExpose } from '@/layout/components/ContextMenu'
 import { useDesign } from '@/hooks/web/useDesign'
 import { useTemplateRefsList } from '@vueuse/core'
 import { ElScrollbar } from 'element-plus'
diff --git a/yudao-ui-admin-vue3/src/components/TagsView/src/helper.ts b/yudao-ui-admin-vue3/src/layout/components/TagsView/src/helper.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/TagsView/src/helper.ts
rename to yudao-ui-admin-vue3/src/layout/components/TagsView/src/helper.ts
diff --git a/yudao-ui-admin-vue3/src/components/ThemeSwitch/index.ts b/yudao-ui-admin-vue3/src/layout/components/ThemeSwitch/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/ThemeSwitch/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/ThemeSwitch/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/ThemeSwitch/src/ThemeSwitch.vue b/yudao-ui-admin-vue3/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/ThemeSwitch/src/ThemeSwitch.vue
rename to yudao-ui-admin-vue3/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue
diff --git a/yudao-ui-admin-vue3/src/layout/components/ToolHeader.vue b/yudao-ui-admin-vue3/src/layout/components/ToolHeader.vue
index 9fde55358..674886c4c 100644
--- a/yudao-ui-admin-vue3/src/layout/components/ToolHeader.vue
+++ b/yudao-ui-admin-vue3/src/layout/components/ToolHeader.vue
@@ -1,11 +1,11 @@
 <script lang="tsx">
 import { defineComponent, computed } from 'vue'
-import { Collapse } from '@/components/Collapse'
-import { LocaleDropdown } from '@/components/LocaleDropdown'
-import { SizeDropdown } from '@/components/SizeDropdown'
-import { UserInfo } from '@/components/UserInfo'
-import { Screenfull } from '@/components/Screenfull'
-import { Breadcrumb } from '@/components/Breadcrumb'
+import { Collapse } from '@/layout/components/Collapse'
+import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
+import { SizeDropdown } from '@/layout/components/SizeDropdown'
+import { UserInfo } from '@/layout/components/UserInfo'
+import { Screenfull } from '@/layout/components/Screenfull'
+import { Breadcrumb } from '@/layout/components/Breadcrumb'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
 
diff --git a/yudao-ui-admin-vue3/src/components/UserInfo/index.ts b/yudao-ui-admin-vue3/src/layout/components/UserInfo/index.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/UserInfo/index.ts
rename to yudao-ui-admin-vue3/src/layout/components/UserInfo/index.ts
diff --git a/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue b/yudao-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue
similarity index 100%
rename from yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
rename to yudao-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue
diff --git a/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx b/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx
index d388d5f5b..dfec3ff64 100644
--- a/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx
+++ b/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx
@@ -1,9 +1,9 @@
 import { computed } from 'vue'
 import { useAppStore } from '@/store/modules/app'
-import { Menu } from '@/components/Menu'
-import { TabMenu } from '@/components/TabMenu'
-import { TagsView } from '@/components/TagsView'
-import { Logo } from '@/components/Logo'
+import { Menu } from '@/layout/components/Menu'
+import { TabMenu } from '@/layout/components/TabMenu'
+import { TagsView } from '@/layout/components/TagsView'
+import { Logo } from '@/layout/components/Logo'
 import AppView from './AppView.vue'
 import ToolHeader from './ToolHeader.vue'
 import { ElScrollbar } from 'element-plus'
diff --git a/yudao-ui-admin-vue3/src/views/Login/Login.vue b/yudao-ui-admin-vue3/src/views/Login/Login.vue
index 4492d7238..d6154cada 100644
--- a/yudao-ui-admin-vue3/src/views/Login/Login.vue
+++ b/yudao-ui-admin-vue3/src/views/Login/Login.vue
@@ -63,8 +63,8 @@ import { underlineToHump } from '@/utils'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useDesign } from '@/hooks/web/useDesign'
 import { useAppStore } from '@/store/modules/app'
-import { ThemeSwitch } from '@/components/ThemeSwitch'
-import { LocaleDropdown } from '@/components/LocaleDropdown'
+import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
+import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
 import { LoginForm, MobileForm, RegisterForm, QrCodeForm } from './components'
 
 const { t } = useI18n()