diff --git a/dot_config/nvim/exact_lua/exact_config/lazy.lua b/dot_config/nvim/exact_lua/exact_config/lazy.lua
index 65397cc..d26616d 100644
--- a/dot_config/nvim/exact_lua/exact_config/lazy.lua
+++ b/dot_config/nvim/exact_lua/exact_config/lazy.lua
@@ -40,10 +40,13 @@ require("lazy").setup({
     -- },
     -- 自動載入 plugins 資料夾中的所有插件
     { import = "plugins" },
-    { import = "plugins.colorscheme.nightfox" }, -- 自訂配色
-    -- { import = "plugins.colorscheme.github-theme" }, -- 自訂配色
-    -- { import = "plugins.colorscheme.onedark" }, -- 自訂配色
-    { import = "plugins.tab.barbar" }, -- 目前只有barbar處理Buffer是最好的
+    { import = "plugins.themes.nightfox" }, -- 自訂配色
+    -- { import = "plugins.themes.github-theme" }, -- 自訂配色
+    -- { import = "plugins.themes.onedark" }, -- 自訂配色
+
+    { import = "plugins.components.buffer.barbar" }, -- 目前只有barbar處理Buffer是最好的
+    { import = "plugins.components" },
+    { import = "plugins.ui" },
 
     -- 手動引入 o-plugins 資料夾中的插件
     -- require("o-plugins.nvim-listchars"),
diff --git a/dot_config/nvim/exact_lua/exact_plugins/tab/barbar.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_components/exact_buffer/barbar.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/tab/barbar.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_components/exact_buffer/barbar.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/tab/bufferline.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_components/exact_buffer/bufferline.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/tab/bufferline.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_components/exact_buffer/bufferline.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/tab/tabby.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_components/exact_buffer/tabby.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/tab/tabby.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_components/exact_buffer/tabby.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/neo-tree.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_components/neo-tree.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/neo-tree.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_components/neo-tree.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/terminal.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_components/terminal.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/terminal.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_components/terminal.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/colorscheme/github-theme.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_themes/github-theme.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/colorscheme/github-theme.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_themes/github-theme.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/colorscheme/nightfox.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_themes/nightfox.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/colorscheme/nightfox.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_themes/nightfox.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/colorscheme/onedark.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_themes/onedark.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/colorscheme/onedark.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_themes/onedark.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/help.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_ui/help.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/help.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_ui/help.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/lualine.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_ui/lualine.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/lualine.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_ui/lualine.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/modes.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_ui/modes.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/modes.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_ui/modes.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/noice.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_ui/noice.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/noice.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_ui/noice.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/scroll.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_ui/scroll.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/scroll.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_ui/scroll.lua
diff --git a/dot_config/nvim/exact_lua/exact_plugins/scrollbar.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_ui/scrollbar.lua
similarity index 100%
rename from dot_config/nvim/exact_lua/exact_plugins/scrollbar.lua
rename to dot_config/nvim/exact_lua/exact_plugins/exact_ui/scrollbar.lua