diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index 85608ee1..5d00dfad 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -41,6 +41,22 @@
     "plugins.extras.lang.web.html-css",
     "plugins.extras.lang.web.typescript-extended",
     "plugins.extras.lang.web.vue",
+    "plugins.extras.lazyvim.bufferline",
+    "plugins.extras.lazyvim.cmp",
+    "plugins.extras.lazyvim.dashboard",
+    "plugins.extras.lazyvim.flash",
+    "plugins.extras.lazyvim.gitsigns",
+    "plugins.extras.lazyvim.lspconfig",
+    "plugins.extras.lazyvim.lualine",
+    "plugins.extras.lazyvim.luasnip",
+    "plugins.extras.lazyvim.mason",
+    "plugins.extras.lazyvim.neo-tree",
+    "plugins.extras.lazyvim.noice",
+    "plugins.extras.lazyvim.nvim-notify",
+    "plugins.extras.lazyvim.persistence",
+    "plugins.extras.lazyvim.spectre",
+    "plugins.extras.lazyvim.telescope",
+    "plugins.extras.lazyvim.which-key",
     "plugins.extras.linting.eslint-extended",
     "plugins.extras.lsp.actions-preview",
     "plugins.extras.lsp.file-operations",
diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua
index a10b6b7d..fa9a928a 100644
--- a/.config/nvim/lua/config/lazy.lua
+++ b/.config/nvim/lua/config/lazy.lua
@@ -9,17 +9,16 @@ vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
 
 require("lazy").setup({
   spec = {
-    -- add LazyVim and import its plugins
-    { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+    {
+      "LazyVim/LazyVim",
+      import = "lazyvim.plugins",
+      opts = { colorscheme = "catppuccin" },
+    },
     { import = "plugins" },
     { import = "lazyvim.plugins.extras.lazyrc" },
   },
   defaults = {
-    -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
-    -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
     lazy = true,
-    -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
-    -- have outdated releases, which may break your Neovim install.
     version = false, -- always use the latest git commit
     -- version = "*", -- try installing the latest stable version for plugins that support semver
   },
diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua
deleted file mode 100644
index 987ca4b8..00000000
--- a/.config/nvim/lua/plugins/colorscheme.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-  "LazyVim/LazyVim",
-  opts = {
-    colorscheme = "catppuccin",
-  },
-}
diff --git a/.config/nvim/lua/plugins/bufferline.lua b/.config/nvim/lua/plugins/extras/lazyvim/bufferline.lua
similarity index 100%
rename from .config/nvim/lua/plugins/bufferline.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/bufferline.lua
diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/extras/lazyvim/cmp.lua
similarity index 100%
rename from .config/nvim/lua/plugins/cmp.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/cmp.lua
diff --git a/.config/nvim/lua/plugins/dashboard.lua b/.config/nvim/lua/plugins/extras/lazyvim/dashboard.lua
similarity index 100%
rename from .config/nvim/lua/plugins/dashboard.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/dashboard.lua
diff --git a/.config/nvim/lua/plugins/flash.lua b/.config/nvim/lua/plugins/extras/lazyvim/flash.lua
similarity index 100%
rename from .config/nvim/lua/plugins/flash.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/flash.lua
diff --git a/.config/nvim/lua/plugins/gitsigns.lua b/.config/nvim/lua/plugins/extras/lazyvim/gitsigns.lua
similarity index 100%
rename from .config/nvim/lua/plugins/gitsigns.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/gitsigns.lua
diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/extras/lazyvim/lspconfig.lua
similarity index 100%
rename from .config/nvim/lua/plugins/lspconfig.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/lspconfig.lua
diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/extras/lazyvim/lualine.lua
similarity index 100%
rename from .config/nvim/lua/plugins/lualine.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/lualine.lua
diff --git a/.config/nvim/lua/plugins/luasnip.lua b/.config/nvim/lua/plugins/extras/lazyvim/luasnip.lua
similarity index 100%
rename from .config/nvim/lua/plugins/luasnip.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/luasnip.lua
diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/extras/lazyvim/mason.lua
similarity index 100%
rename from .config/nvim/lua/plugins/mason.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/mason.lua
diff --git a/.config/nvim/lua/plugins/neo-tree.lua b/.config/nvim/lua/plugins/extras/lazyvim/neo-tree.lua
similarity index 100%
rename from .config/nvim/lua/plugins/neo-tree.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/neo-tree.lua
diff --git a/.config/nvim/lua/plugins/noice.lua b/.config/nvim/lua/plugins/extras/lazyvim/noice.lua
similarity index 100%
rename from .config/nvim/lua/plugins/noice.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/noice.lua
diff --git a/.config/nvim/lua/plugins/nvim-notify.lua b/.config/nvim/lua/plugins/extras/lazyvim/nvim-notify.lua
similarity index 100%
rename from .config/nvim/lua/plugins/nvim-notify.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/nvim-notify.lua
diff --git a/.config/nvim/lua/plugins/persistence.lua b/.config/nvim/lua/plugins/extras/lazyvim/persistence.lua
similarity index 85%
rename from .config/nvim/lua/plugins/persistence.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/persistence.lua
index 82a1e484..128f373b 100644
--- a/.config/nvim/lua/plugins/persistence.lua
+++ b/.config/nvim/lua/plugins/extras/lazyvim/persistence.lua
@@ -5,7 +5,7 @@ return {
   "folke/persistence.nvim",
   keys = {
     {
-      "<leader>qs",
+      "<leader>qS",
       function()
         p.save()
         vim.notify("Session saved", vim.log.levels.INFO, { title = "Persistence" })
@@ -13,7 +13,6 @@ return {
       desc = "Save Session",
     },
     -- stylua: ignore start
-    { "<leader>qr", function() require("persistence").load({ last = true }) end, desc = "Restore Last Session" },
     { "<leader>qt",
       function()
         if isActive then
diff --git a/.config/nvim/lua/plugins/spectre.lua b/.config/nvim/lua/plugins/extras/lazyvim/spectre.lua
similarity index 100%
rename from .config/nvim/lua/plugins/spectre.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/spectre.lua
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/extras/lazyvim/telescope.lua
similarity index 100%
rename from .config/nvim/lua/plugins/telescope.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/telescope.lua
diff --git a/.config/nvim/lua/plugins/which-key.lua b/.config/nvim/lua/plugins/extras/lazyvim/which-key.lua
similarity index 100%
rename from .config/nvim/lua/plugins/which-key.lua
rename to .config/nvim/lua/plugins/extras/lazyvim/which-key.lua