diff --git a/AGENTS.md b/AGENTS.md
index 04fab6f..36ddeb1 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -68,30 +68,35 @@ Renderer (src/renderer/)
       │   ├── connection.ts  # connections CRUD, connect/disconnect, health check
       │   └── key.ts         # key list, scan, tree view, selected key data
       ├── components/
-      │   ├── TitleBar.vue       # window controls
-      │   ├── StatusBar.vue      # connection status, DB selector
-      │   ├── Sidebar.vue        # keyboard shortcuts, dialog host
-      │   ├── ConnectionList.vue # search, import/export, new button
-      │   ├── ConnectionCard.vue # single connection card
-      │   ├── NewConnectionDialog.vue # create/edit/test connection
-      │   ├── DbSelector.vue     # database 0-15 dropdown
-      │   ├── MainArea.vue       # tab host (Status/Keys/CLI/SlowLog/Settings)
-      │   ├── StatusView.vue     # INFO dashboard with stat cards
-      │   ├── KeyBrowser.vue     # split pane (KeyList + KeyDetail)
-      │   ├── KeyList.vue        # pattern search, filter, SCAN, multi-select
-      │   ├── KeyDetail.vue      # type dispatch, TTL, rename, copy
-      │   ├── StringEditor.vue   # view/edit with JSON format
-      │   ├── HashEditor.vue     # field table CRUD
-      │   ├── ListEditor.vue     # paginated elements
-      │   ├── SetEditor.vue      # member list
-      │   ├── ZsetEditor.vue     # sorted set with scores
-      │   ├── StreamEditor.vue   # stream entries
-      │   ├── CliView.vue        # interactive terminal
-      │   ├── SlowLogView.vue    # slow log table
-      │   ├── SettingsView.vue   # theme, language, scan count
-      │   ├── MemoryAnalysis.vue # MEMORY USAGE scan & sort
-      │   ├── CommandLog.vue     # command execution history
-      │   └── ReJsonEditor.vue   # JSON.GET / JSON.SET editing
+      │   ├── layout/                   # App shell
+      │   │   ├── TitleBar.vue          # window controls
+      │   │   ├── StatusBar.vue         # connection status
+      │   │   ├── Sidebar.vue           # connection list host, keyboard shortcuts
+      │   │   └── MainArea.vue          # tab host (Status/Keys/CLI/SlowLog/Settings)
+      │   ├── connection/               # Connection management
+      │   │   ├── ConnectionList.vue    # search, import/export, context menu
+      │   │   ├── ConnectionCard.vue    # single connection card
+      │   │   └── NewConnectionDialog.vue # create/edit/test connection
+      │   ├── key/                      # Key browsing
+      │   │   ├── KeyBrowser.vue        # split pane (KeyList + KeyDetail)
+      │   │   ├── KeyList.vue           # tree view, SCAN, filter, multi-select
+      │   │   ├── KeyDetail.vue         # type dispatch, TTL, rename, copy
+      │   │   └── DbSelector.vue        # database 0-15 dropdown
+      │   ├── editors/                  # Type-specific value editors
+      │   │   ├── StringEditor.vue      # view/edit with JSON format
+      │   │   ├── HashEditor.vue        # field table CRUD
+      │   │   ├── ListEditor.vue        # paginated elements
+      │   │   ├── SetEditor.vue         # member list
+      │   │   ├── ZsetEditor.vue        # sorted set with scores
+      │   │   ├── StreamEditor.vue      # stream entries
+      │   │   └── ReJsonEditor.vue      # JSON.GET / JSON.SET editing
+      │   └── views/                    # Tab content views
+      │       ├── StatusView.vue        # INFO dashboard with stat cards
+      │       ├── CliView.vue           # interactive terminal
+      │       ├── SlowLogView.vue       # slow log table
+      │       ├── MemoryAnalysis.vue    # MEMORY USAGE scan & sort
+      │       ├── CommandLog.vue        # command execution history
+      │       └── SettingsView.vue      # theme, language, font
       ├── i18n/
       │   ├── index.ts           # useI18n composable
       │   └── locales/
diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
index 5395536..a7d040f 100644
--- a/src/renderer/src/App.vue
+++ b/src/renderer/src/App.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
-import TitleBar from './components/TitleBar.vue'
-import Sidebar from './components/Sidebar.vue'
-import MainArea from './components/MainArea.vue'
-import StatusBar from './components/StatusBar.vue'
+import TitleBar from './components/layout/TitleBar.vue'
+import Sidebar from './components/layout/Sidebar.vue'
+import MainArea from './components/layout/MainArea.vue'
+import StatusBar from './components/layout/StatusBar.vue'
 import { useConnectionStore } from '@renderer/stores/connection'
 
 const connStore = useConnectionStore()
diff --git a/src/renderer/src/components/ConnectionCard.vue b/src/renderer/src/components/connection/ConnectionCard.vue
similarity index 100%
rename from src/renderer/src/components/ConnectionCard.vue
rename to src/renderer/src/components/connection/ConnectionCard.vue
diff --git a/src/renderer/src/components/ConnectionList.vue b/src/renderer/src/components/connection/ConnectionList.vue
similarity index 100%
rename from src/renderer/src/components/ConnectionList.vue
rename to src/renderer/src/components/connection/ConnectionList.vue
diff --git a/src/renderer/src/components/NewConnectionDialog.vue b/src/renderer/src/components/connection/NewConnectionDialog.vue
similarity index 100%
rename from src/renderer/src/components/NewConnectionDialog.vue
rename to src/renderer/src/components/connection/NewConnectionDialog.vue
diff --git a/src/renderer/src/components/HashEditor.vue b/src/renderer/src/components/editors/HashEditor.vue
similarity index 100%
rename from src/renderer/src/components/HashEditor.vue
rename to src/renderer/src/components/editors/HashEditor.vue
diff --git a/src/renderer/src/components/ListEditor.vue b/src/renderer/src/components/editors/ListEditor.vue
similarity index 100%
rename from src/renderer/src/components/ListEditor.vue
rename to src/renderer/src/components/editors/ListEditor.vue
diff --git a/src/renderer/src/components/ReJsonEditor.vue b/src/renderer/src/components/editors/ReJsonEditor.vue
similarity index 100%
rename from src/renderer/src/components/ReJsonEditor.vue
rename to src/renderer/src/components/editors/ReJsonEditor.vue
diff --git a/src/renderer/src/components/SetEditor.vue b/src/renderer/src/components/editors/SetEditor.vue
similarity index 100%
rename from src/renderer/src/components/SetEditor.vue
rename to src/renderer/src/components/editors/SetEditor.vue
diff --git a/src/renderer/src/components/StreamEditor.vue b/src/renderer/src/components/editors/StreamEditor.vue
similarity index 100%
rename from src/renderer/src/components/StreamEditor.vue
rename to src/renderer/src/components/editors/StreamEditor.vue
diff --git a/src/renderer/src/components/StringEditor.vue b/src/renderer/src/components/editors/StringEditor.vue
similarity index 100%
rename from src/renderer/src/components/StringEditor.vue
rename to src/renderer/src/components/editors/StringEditor.vue
diff --git a/src/renderer/src/components/ZsetEditor.vue b/src/renderer/src/components/editors/ZsetEditor.vue
similarity index 100%
rename from src/renderer/src/components/ZsetEditor.vue
rename to src/renderer/src/components/editors/ZsetEditor.vue
diff --git a/src/renderer/src/components/DbSelector.vue b/src/renderer/src/components/key/DbSelector.vue
similarity index 100%
rename from src/renderer/src/components/DbSelector.vue
rename to src/renderer/src/components/key/DbSelector.vue
diff --git a/src/renderer/src/components/KeyBrowser.vue b/src/renderer/src/components/key/KeyBrowser.vue
similarity index 100%
rename from src/renderer/src/components/KeyBrowser.vue
rename to src/renderer/src/components/key/KeyBrowser.vue
diff --git a/src/renderer/src/components/KeyDetail.vue b/src/renderer/src/components/key/KeyDetail.vue
similarity index 95%
rename from src/renderer/src/components/KeyDetail.vue
rename to src/renderer/src/components/key/KeyDetail.vue
index 3c72b6f..41002bc 100644
--- a/src/renderer/src/components/KeyDetail.vue
+++ b/src/renderer/src/components/key/KeyDetail.vue
@@ -5,13 +5,13 @@ import { useConnectionStore } from '@renderer/stores/connection'
 import { useI18n } from '@renderer/i18n'
 import { formatKeyName, isBinaryKey } from '@renderer/utils/binary'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import StringEditor from './StringEditor.vue'
-import HashEditor from './HashEditor.vue'
-import ListEditor from './ListEditor.vue'
-import SetEditor from './SetEditor.vue'
-import ZsetEditor from './ZsetEditor.vue'
-import StreamEditor from './StreamEditor.vue'
-import ReJsonEditor from './ReJsonEditor.vue'
+import StringEditor from '../editors/StringEditor.vue'
+import HashEditor from '../editors/HashEditor.vue'
+import ListEditor from '../editors/ListEditor.vue'
+import SetEditor from '../editors/SetEditor.vue'
+import ZsetEditor from '../editors/ZsetEditor.vue'
+import StreamEditor from '../editors/StreamEditor.vue'
+import ReJsonEditor from '../editors/ReJsonEditor.vue'
 
 const keyStore = useKeyStore()
 const connStore = useConnectionStore()
diff --git a/src/renderer/src/components/KeyList.vue b/src/renderer/src/components/key/KeyList.vue
similarity index 100%
rename from src/renderer/src/components/KeyList.vue
rename to src/renderer/src/components/key/KeyList.vue
diff --git a/src/renderer/src/components/MainArea.vue b/src/renderer/src/components/layout/MainArea.vue
similarity index 97%
rename from src/renderer/src/components/MainArea.vue
rename to src/renderer/src/components/layout/MainArea.vue
index 61de194..392d12e 100644
--- a/src/renderer/src/components/MainArea.vue
+++ b/src/renderer/src/components/layout/MainArea.vue
@@ -2,13 +2,13 @@
 import { ref, watch, computed, nextTick, onMounted, onUnmounted } from 'vue'
 import { useConnectionStore } from '@renderer/stores/connection'
 import { useI18n } from '@renderer/i18n'
-import StatusView from './StatusView.vue'
-import KeyBrowser from './KeyBrowser.vue'
-import CliView from './CliView.vue'
-import SlowLogView from './SlowLogView.vue'
-import MemoryAnalysis from './MemoryAnalysis.vue'
-import SettingsView from './SettingsView.vue'
-import DbSelector from './DbSelector.vue'
+import StatusView from '../views/StatusView.vue'
+import KeyBrowser from '../key/KeyBrowser.vue'
+import CliView from '../views/CliView.vue'
+import SlowLogView from '../views/SlowLogView.vue'
+import MemoryAnalysis from '../views/MemoryAnalysis.vue'
+import SettingsView from '../views/SettingsView.vue'
+import DbSelector from '../key/DbSelector.vue'
 
 const connStore = useConnectionStore()
 const { t } = useI18n()
diff --git a/src/renderer/src/components/Sidebar.vue b/src/renderer/src/components/layout/Sidebar.vue
similarity index 97%
rename from src/renderer/src/components/Sidebar.vue
rename to src/renderer/src/components/layout/Sidebar.vue
index 2c47daa..4ed9bdd 100644
--- a/src/renderer/src/components/Sidebar.vue
+++ b/src/renderer/src/components/layout/Sidebar.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted } from 'vue'
-import ConnectionList from './ConnectionList.vue'
-import NewConnectionDialog from './NewConnectionDialog.vue'
-import CommandLog from './CommandLog.vue'
+import ConnectionList from '../connection/ConnectionList.vue'
+import NewConnectionDialog from '../connection/NewConnectionDialog.vue'
+import CommandLog from '../views/CommandLog.vue'
 import { useConnectionStore } from '@renderer/stores/connection'
 import { useKeyStore } from '@renderer/stores/key'
 import { useI18n } from '@renderer/i18n'
diff --git a/src/renderer/src/components/StatusBar.vue b/src/renderer/src/components/layout/StatusBar.vue
similarity index 100%
rename from src/renderer/src/components/StatusBar.vue
rename to src/renderer/src/components/layout/StatusBar.vue
diff --git a/src/renderer/src/components/TitleBar.vue b/src/renderer/src/components/layout/TitleBar.vue
similarity index 100%
rename from src/renderer/src/components/TitleBar.vue
rename to src/renderer/src/components/layout/TitleBar.vue
diff --git a/src/renderer/src/components/CliView.vue b/src/renderer/src/components/views/CliView.vue
similarity index 100%
rename from src/renderer/src/components/CliView.vue
rename to src/renderer/src/components/views/CliView.vue
diff --git a/src/renderer/src/components/CommandLog.vue b/src/renderer/src/components/views/CommandLog.vue
similarity index 100%
rename from src/renderer/src/components/CommandLog.vue
rename to src/renderer/src/components/views/CommandLog.vue
diff --git a/src/renderer/src/components/MemoryAnalysis.vue b/src/renderer/src/components/views/MemoryAnalysis.vue
similarity index 100%
rename from src/renderer/src/components/MemoryAnalysis.vue
rename to src/renderer/src/components/views/MemoryAnalysis.vue
diff --git a/src/renderer/src/components/SettingsView.vue b/src/renderer/src/components/views/SettingsView.vue
similarity index 100%
rename from src/renderer/src/components/SettingsView.vue
rename to src/renderer/src/components/views/SettingsView.vue
diff --git a/src/renderer/src/components/SlowLogView.vue b/src/renderer/src/components/views/SlowLogView.vue
similarity index 100%
rename from src/renderer/src/components/SlowLogView.vue
rename to src/renderer/src/components/views/SlowLogView.vue
diff --git a/src/renderer/src/components/StatusView.vue b/src/renderer/src/components/views/StatusView.vue
similarity index 100%
rename from src/renderer/src/components/StatusView.vue
rename to src/renderer/src/components/views/StatusView.vue