diff --git a/init.lua b/init.lua
index aa80f63..3032efb 100755
--- a/init.lua
+++ b/init.lua
@@ -1,2 +1,3 @@
 ---@diagnostic disable-next-line: different-requires
 require("core.lazy")
+
diff --git a/lazy-lock.json b/lazy-lock.json
index ee1e5e3..039a451 100755
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,15 +1,14 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "9f74c6a52f4f6adaf3b3d64b15d2363219afefae" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "4ce271f0db8b5224b4d69a43a75c13f5b4dcba43" },
   "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
   "barbecue.nvim": { "branch": "main", "commit": "d38a2a023dfb1073dd0e8fee0c9be08855d3688f" },
   "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" },
   "cheatsheet.nvim": { "branch": "master", "commit": "9716f9aaa94dd1fd6ce59b5aae0e5f25e2a463ef" },
-  "clangd_extensions.nvim": { "branch": "main", "commit": "34c8eaa12be192e83cd4865ce2375e9f53e728f2" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
-  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
+  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-cmdline-history": { "branch": "master", "commit": "003573b72d4635ce636234a826fa8c4ba2895ffe" },
   "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" },
   "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" },
@@ -23,81 +22,81 @@
   "cmp-zsh": { "branch": "main", "commit": "c24db8e58fac9006ec23d93f236749288d00dec9" },
   "cmp_kitty": { "branch": "main", "commit": "a0716db2efb4c452600ef1e4a3ca610889279118" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "codeium.nvim": { "branch": "main", "commit": "73ba2a3a41484437ff8a45ca1e796fa9d6fa1153" },
+  "codeium.nvim": { "branch": "main", "commit": "a070f57c0f54bd940436b94c8b679bcad5a48811" },
   "comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" },
   "compile-nvim": { "branch": "main", "commit": "f7ad312ec5d0ae4a0554a7e52349ee371b868a5d" },
-  "conform.nvim": { "branch": "master", "commit": "67ee2258e08ccb91345d52f62484b657feccef25" },
+  "conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" },
   "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
   "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
   "crates.nvim": { "branch": "main", "commit": "b4f4987ccdb1cc3899ee541ef4375c73c48c4570" },
-  "dashboard-nvim": { "branch": "master", "commit": "413442b12d85315fc626c44a0ce4929b213ef604" },
+  "dashboard-nvim": { "branch": "master", "commit": "39f308a0b845b8da46f83c8a2d69f0191d4b7a8f" },
   "dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" },
   "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" },
   "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
-  "gitsigns.nvim": { "branch": "main", "commit": "4e348641b8206c3b8d23080999e3ddbe4ca90efc" },
+  "garbage-day.nvim": { "branch": "main", "commit": "3af496f0d1dc6586dcf4ceda6bbf61a8f820ab66" },
+  "gitsigns.nvim": { "branch": "main", "commit": "70584ff9aae8078b64430c574079d79620b8f06d" },
   "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
   "hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
   "keymap-layer.nvim": { "branch": "master", "commit": "e46840f9f377766e856964a49d7f351de3188a38" },
   "kiwi.nvim": { "branch": "master", "commit": "1a625771e3d3d9f50ca28a4501c11842f6c1ec1e" },
-  "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
-  "lazygit.nvim": { "branch": "main", "commit": "774dcecbd0b9b57be6c150adacb60ced79b11b23" },
+  "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
+  "lazygit.nvim": { "branch": "main", "commit": "0ada6c6e7e138df92f5009b6952f4ac41248305a" },
   "llm.nvim": { "branch": "main", "commit": "51b76dac9c33c0122adfe28daf52ceaa31c4aa02" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "1b32f64549478efd8f9e0d00517db84cf41aa0ea" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" },
   "lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
-  "lspsaga.nvim": { "branch": "main", "commit": "74b13f63417014739ac09576f7196bec301fa2ac" },
-  "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "55716a879568a498fa236593c8119789054a3b8e" },
+  "lspsaga.nvim": { "branch": "main", "commit": "d5aa1a02a23b5725054928426b1de6932a6d3bc3" },
+  "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" },
-  "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
+  "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
   "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
-  "mind.nvim": { "branch": "v2.2", "commit": "79e0ca131d5e37dfa65f3f0e725d99742e4ff783" },
   "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" },
   "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" },
   "mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" },
-  "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" },
+  "mini.surround": { "branch": "main", "commit": "49e0364b8c9a3258b485c5ece40bb0f3a5e94b1c" },
   "monokai-pro.nvim": { "branch": "master", "commit": "1b9b086df95ad9a6b946c56f65fa2d048297c00b" },
   "neo-tree-diagnostics.nvim": { "branch": "main", "commit": "e00434c3cf8637bcaf70f65c2b9d82b0cc9bd7dc" },
-  "neo-tree.nvim": { "branch": "main", "commit": "120a83eb7c3c240d5298122111e9f65f0ee5bc8f" },
-  "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
+  "neo-tree.nvim": { "branch": "main", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" },
+  "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
   "nix-develop.nvim": { "branch": "main", "commit": "afea026f5c478c000a8af8de87f7b711676387ab" },
-  "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
-  "none-ls.nvim": { "branch": "main", "commit": "72e25ed4162474ef5d666525853f8a42bffd97c5" },
-  "nui.nvim": { "branch": "main", "commit": "3dc46d725f7b94bee5117c0a699b57b1902b5d65" },
-  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
+  "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" },
+  "none-ls.nvim": { "branch": "main", "commit": "18910d09d21d7df339805343bfe4a2b2e41c057b" },
+  "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
+  "nvim-cmp": { "branch": "main", "commit": "97dc716fc914c46577a4f254035ebef1aa72558a" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-dap": { "branch": "master", "commit": "c43c2473ecb482a9d91f32c1d4c0098fffad3c7d" },
+  "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" },
   "nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" },
   "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" },
-  "nvim-lspconfig": { "branch": "master", "commit": "4bdd3800b4148f670c6cf55ef65f490148eeb550" },
+  "nvim-lspconfig": { "branch": "master", "commit": "6e5c78ebc9936ca74add66bda22c566f951b6ee5" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
   "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
-  "nvim-spectre": { "branch": "master", "commit": "d1db6c1d37252b5a38f199e2f590c5a1617d9254" },
-  "nvim-treesitter": { "branch": "master", "commit": "f87882858438834d2fbb6379aa2be37de901751b" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "b8b7e52c1517d401d7c519787d5dc4528c41291a" },
+  "nvim-spectre": { "branch": "master", "commit": "2b012554a2536465243c0dff3605b5927c49ed23" },
+  "nvim-treesitter": { "branch": "master", "commit": "c65413f2ac20d1d4b91fe4eb32d9d25525b34b83" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "f19766163c18515fb4d3c12d572bf9cba6cdb990" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" },
   "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
-  "nvim-web-devicons": { "branch": "master", "commit": "a851380fbea4c1312d11f13d5cdc86a7a19808dd" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "734ebad31c81c6198dfe102aa23280937c937c42" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" },
   "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
-  "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
+  "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
-  "quicknote.nvim": { "branch": "master", "commit": "530ee1f74b0ef191a3a8110b5f9d4bdffc7bfd6c" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "cfc3f53cfa0fbabd95bd33747288aea24fe45211" },
+  "quicknote.nvim": { "branch": "master", "commit": "2fc56f96ef1d983609c1c40b799d7ec32693362a" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "580bc045c7ab3ab3ebd267774038c0d8cc19c789" },
   "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
   "sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" },
   "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" },
   "swenv.nvim": { "branch": "main", "commit": "c11eeaa6f8f05abdcbb0a53d0ac290e3f9fabd2c" },
-  "telescope.nvim": { "branch": "master", "commit": "e9e01d699843af530ef4ad2c8679a7e273bb3dd1" },
-  "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
+  "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
+  "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
   "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
-  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
-  "venv-selector.nvim": { "branch": "main", "commit": "2ad34f36d498ff5193ea10f79c87688bd5284172" },
+  "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
+  "venv-selector.nvim": { "branch": "main", "commit": "3c57922256e7e26205a25f5a42ecf7104d9f2c78" },
   "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },
   "vim-eunuch": { "branch": "master", "commit": "8fb3904be27b6b60d086f87c2570085902414069" },
   "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" },
-  "vim-startuptime": { "branch": "master", "commit": "308b0088a864c4711a96e45b6734cf9294074f65" },
+  "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
   "vim-visual-multi": { "branch": "master", "commit": "fe1ec7e430013b83c8c2dee85ae496251b71e253" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
   "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" }
diff --git a/lua/config/hydra/hydra.lua b/lua/config/hydra/hydra.lua
deleted file mode 100755
index eead331..0000000
--- a/lua/config/hydra/hydra.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-require('config.hydra.spelling')
-require('config.hydra.telescope')
-require('config.hydra.windows')
diff --git a/lua/core/lazy.lua b/lua/core/lazy.lua
index 175749d..4a722a2 100755
--- a/lua/core/lazy.lua
+++ b/lua/core/lazy.lua
@@ -14,17 +14,17 @@ vim.opt.rtp:prepend(lazypath)
 -- load lazy
 require("lazy").setup({
   spec = {
-    { import = "resources" },
-    { import = "resources.lang.markdown", enabled = true },
-    { import = "resources.lang.nix", enabled = true },
-    { import = "resources.lang.rust", enabled = true },
-    { import = "resources.lang.python", enabled = true },
-    { import = "resources.lang.php", enabled = true },
-    { import = "resources.lang.typescript", enabled = true },
-    { import = "resources.lang.json", enabled = true },
-    { import = "resources.lang.java", enabled = false },
-    { import = "resources.lang.docker", enabled = true },
-    { import = "resources.lang.clangd", enabled = false },
+    { import = "plugins" },
+    { import = "plugins.lang.markdown", enabled = true },
+    { import = "plugins.lang.nix", enabled = true },
+    { import = "plugins.lang.rust", enabled = true },
+    { import = "plugins.lang.python", enabled = true },
+    { import = "plugins.lang.php", enabled = true },
+    { import = "plugins.lang.typescript", enabled = true },
+    { import = "plugins.lang.json", enabled = true },
+    { import = "plugins.lang.java", enabled = false },
+    { import = "plugins.lang.docker", enabled = true },
+    { import = "plugins.lang.clangd", enabled = false },
   },
   defaults = {
     lazy = false,
diff --git a/lua/core/options.lua b/lua/core/options.lua
index 25a3f97..bf675a2 100755
--- a/lua/core/options.lua
+++ b/lua/core/options.lua
@@ -1,11 +1,14 @@
 local options = {
+  autochdir = true, -- Use current file dir as working dir (See project.nvim).
   background = "dark",
   backup = false, -- creates a backup file
+  breakindent = true, -- Wrap indent to match  line start.
   clipboard = "unnamedplus", -- allows neovim to access the system clipboard
   cmdheight = 0, -- more space in the neovim command line for displaying messages
   completeopt = { "preview", "menu", "menuone" }, -- mostly just for cmp
   conceallevel = 0, -- so that `` is visible in markdown files
   confirm = true, -- Confirm before exiting a modified buffer
+  copyindent = true, -- Copy the previous indentation on autoindenting
   cursorline = true, -- highlight the current line
   expandtab = true, -- convert tabs to spaces
   fileencoding = "utf-8", -- the encoding written to a file
@@ -31,6 +34,7 @@ local options = {
   scrolloff = 3, -- Minimal number of screen lines to keep above and below the cursor
   selection = "inclusive", -- "inclusive", "exclusive" or "old"
   shiftround = true, -- Round indent
+  shada = "!,'1000,<50,s10,h", -- Remember the last 1000 opened files
   shiftwidth = 2, -- the number of spaces inserted for each indentation
   showcmd = false,
   showmode = false, -- we don't need to see things like -- INSERT -- anymore
@@ -51,7 +55,7 @@ local options = {
   titlestring = "%<%F%=%l/%L - nvim",
   undofile = true, -- enable persistent undo
   undolevels = 10000,
-  updatetime = 500, -- faster completion (4000ms default)
+  updatetime = 300, -- faster completion (4000ms default)
   virtualedit = "onemore",
   winminwidth = 5, -- minimum window width
   wrap = true, -- scrolling sideways sucks
@@ -97,9 +101,13 @@ vim.g.loaded_netrwPlugin = 1
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
+
+
 vim.opt.shortmess:append("c")
 vim.opt.viewoptions:remove("curdir") -- disable saving current directory with views
 
+
+
 vim.opt.list = true
 -- vim.opt.listchars:append "space:⋅"
 -- vim.opt.listchars:append "eol:↴"
@@ -120,3 +128,17 @@ end
 
 -- Fix markdown indentation settings
 vim.g.markdown_recommended_style = 0
+
+vim.g.cmp_enabled = true -- Enable completion at start.
+vim.g.codelens_enabled = true -- Enable automatic codelens refreshing for lsp that support it.
+vim.g.diagnostics_mode = 3 -- Set code linting (0=off, 1=only show in status line, 2=virtual text off, 3=all on).
+vim.g.icons_enabled = true -- Enable icons in the UI (disable if no nerd font is available).
+vim.g.inlay_hints_enabled = false -- Enable always show function parameter names.
+vim.g.lsp_round_borders_enabled = true -- Enable round borders for lsp hover and signatureHelp.
+vim.g.lsp_signature_enabled = true -- Enable automatically showing lsp help as you write function parameters.
+vim.g.notifications_enabled = true -- Enable notifications.
+vim.g.semantic_tokens_enabled = true -- Enable lsp semantic tokens at start.
+vim.g.url_effect_enabled = true -- Highlight URLs with an underline effect.
+
+vim.g.autoformat_enabled = true -- Enable auto formatting at start.
+vim.g.autopairs_enabled = true -- Enable autopairs at start.
diff --git a/lua/resources/coding.lua b/lua/plugins/coding.lua
similarity index 100%
rename from lua/resources/coding.lua
rename to lua/plugins/coding.lua
diff --git a/lua/resources/colorscheme.lua b/lua/plugins/colorscheme.lua
similarity index 100%
rename from lua/resources/colorscheme.lua
rename to lua/plugins/colorscheme.lua
diff --git a/lua/config/cmp/dict.lua b/lua/plugins/config/cmp/dict.lua
similarity index 100%
rename from lua/config/cmp/dict.lua
rename to lua/plugins/config/cmp/dict.lua
diff --git a/lua/config/compile.lua b/lua/plugins/config/compile.lua
similarity index 100%
rename from lua/config/compile.lua
rename to lua/plugins/config/compile.lua
diff --git a/lua/config/dashboard.lua b/lua/plugins/config/dashboard.lua
similarity index 100%
rename from lua/config/dashboard.lua
rename to lua/plugins/config/dashboard.lua
diff --git a/lua/plugins/config/hydra/hydra.lua b/lua/plugins/config/hydra/hydra.lua
new file mode 100755
index 0000000..a966048
--- /dev/null
+++ b/lua/plugins/config/hydra/hydra.lua
@@ -0,0 +1,3 @@
+require('plugins.config.hydra.spelling')
+require('plugins.config.hydra.telescope')
+require('plugins.config.hydra.windows')
diff --git a/lua/config/hydra/spelling.lua b/lua/plugins/config/hydra/spelling.lua
similarity index 100%
rename from lua/config/hydra/spelling.lua
rename to lua/plugins/config/hydra/spelling.lua
diff --git a/lua/config/hydra/telescope.lua b/lua/plugins/config/hydra/telescope.lua
similarity index 100%
rename from lua/config/hydra/telescope.lua
rename to lua/plugins/config/hydra/telescope.lua
diff --git a/lua/config/hydra/windows.lua b/lua/plugins/config/hydra/windows.lua
similarity index 100%
rename from lua/config/hydra/windows.lua
rename to lua/plugins/config/hydra/windows.lua
diff --git a/lua/config/lsp/diagnostics.lua b/lua/plugins/config/lsp/diagnostics.lua
similarity index 100%
rename from lua/config/lsp/diagnostics.lua
rename to lua/plugins/config/lsp/diagnostics.lua
diff --git a/lua/config/lsp/gitsigns.lua b/lua/plugins/config/lsp/gitsigns.lua
similarity index 100%
rename from lua/config/lsp/gitsigns.lua
rename to lua/plugins/config/lsp/gitsigns.lua
diff --git a/lua/config/lsp/keymaps.lua b/lua/plugins/config/lsp/keymaps.lua
similarity index 100%
rename from lua/config/lsp/keymaps.lua
rename to lua/plugins/config/lsp/keymaps.lua
diff --git a/lua/config/lualine/components.lua b/lua/plugins/config/lualine/components.lua
similarity index 98%
rename from lua/config/lualine/components.lua
rename to lua/plugins/config/lualine/components.lua
index 313826a..8150641 100755
--- a/lua/config/lualine/components.lua
+++ b/lua/plugins/config/lualine/components.lua
@@ -1,4 +1,4 @@
-local config = require("config.lualine.config").options
+local config = require("plugins.config.lualine.config").options
 local icons = require("core.icons")
 
 local M = {}
diff --git a/lua/config/lualine/config.lua b/lua/plugins/config/lualine/config.lua
similarity index 100%
rename from lua/config/lualine/config.lua
rename to lua/plugins/config/lualine/config.lua
diff --git a/lua/config/lualine/highlights.lua b/lua/plugins/config/lualine/highlights.lua
similarity index 100%
rename from lua/config/lualine/highlights.lua
rename to lua/plugins/config/lualine/highlights.lua
diff --git a/lua/config/lualine/init.lua b/lua/plugins/config/lualine/init.lua
similarity index 85%
rename from lua/config/lualine/init.lua
rename to lua/plugins/config/lualine/init.lua
index 8bef282..ad72cf7 100755
--- a/lua/config/lualine/init.lua
+++ b/lua/plugins/config/lualine/init.lua
@@ -1,10 +1,10 @@
-local config = require("config.lualine.config")
+local config = require("plugins.config.lualine.config")
 
 local M = {}
 
 local function setup()
-  local cpn = require("config.lualine.components")
-  local theme = require("config.lualine.highlights").custom(config.options)
+  local cpn = require("plugins.config.lualine.components")
+  local theme = require("plugins.config.lualine.highlights").custom(config.options)
 
   require("lualine").setup({
     options = {
diff --git a/lua/config/neo-tree/init.lua b/lua/plugins/config/neo-tree/init.lua
similarity index 97%
rename from lua/config/neo-tree/init.lua
rename to lua/plugins/config/neo-tree/init.lua
index 117061b..ea5dac0 100755
--- a/lua/config/neo-tree/init.lua
+++ b/lua/plugins/config/neo-tree/init.lua
@@ -83,7 +83,7 @@ local config = {
   async_directory_scan = "always",
 }
 
-config.filesystem.components = require("config.neo-tree.sources.filesystem.components")
+config.filesystem.components = require("plugins.config.neo-tree.sources.filesystem.components")
 local function hideCursor()
   vim.cmd([[
     setlocal guicursor=n:block-Cursor
diff --git a/lua/config/neo-tree/sources/filesystem/components.lua b/lua/plugins/config/neo-tree/sources/filesystem/components.lua
similarity index 100%
rename from lua/config/neo-tree/sources/filesystem/components.lua
rename to lua/plugins/config/neo-tree/sources/filesystem/components.lua
diff --git a/lua/resources/editor.lua b/lua/plugins/editor.lua
similarity index 97%
rename from lua/resources/editor.lua
rename to lua/plugins/editor.lua
index 1e483de..a444fb2 100755
--- a/lua/resources/editor.lua
+++ b/lua/plugins/editor.lua
@@ -27,7 +27,7 @@ return {
         desc = "Explorer Float (root dir)",
       },
     },
-    opts = require("config.neo-tree"),
+    opts = require("plugins.config.neo-tree"),
     init = function()
       vim.g.neo_tree_remove_legacy_commands = 1
       if vim.fn.argc() == 1 then
@@ -201,7 +201,7 @@ return {
       { "<leader>F", Util.telescope("live_grep"), desc = "Find Text" },
       { "<leader>b", Util.telescope("buffers"), desc = "Find buffer" },
     },
-    -- config = function() require("config.telescope") end,
+    -- config = function() require("plugins.config.telescope") end,
   },
   -- ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
   {
@@ -500,6 +500,7 @@ return {
       })
     end,
   },
+--─────────────────────────────────────────────────────────────────
   {
     "nvim-pack/nvim-spectre",
     build = false,
@@ -510,4 +511,5 @@ return {
     { "<leader>sr", function() require("spectre").open() end, desc = "Replace in files (Spectre)" },
   },
   },
+-- ─────────────────────────────────────────────────────────────────
 }
diff --git a/lua/resources/formatting.lua b/lua/plugins/formatting.lua
similarity index 100%
rename from lua/resources/formatting.lua
rename to lua/plugins/formatting.lua
diff --git a/lua/resources/lang/clangd.lua b/lua/plugins/lang/clangd.lua
similarity index 98%
rename from lua/resources/lang/clangd.lua
rename to lua/plugins/lang/clangd.lua
index f5ac24e..e64b691 100755
--- a/lua/resources/lang/clangd.lua
+++ b/lua/plugins/lang/clangd.lua
@@ -53,7 +53,7 @@ return {
               "Makefile",
               "configure.ac",
               "configure.in",
-              "config.h.in",
+              "plugins.config.h.in",
               "meson.build",
               "meson_options.txt",
               "build.ninja"
diff --git a/lua/resources/lang/docker.lua b/lua/plugins/lang/docker.lua
similarity index 100%
rename from lua/resources/lang/docker.lua
rename to lua/plugins/lang/docker.lua
diff --git a/lua/resources/lang/java.lua b/lua/plugins/lang/java.lua
similarity index 100%
rename from lua/resources/lang/java.lua
rename to lua/plugins/lang/java.lua
diff --git a/lua/resources/lang/json.lua b/lua/plugins/lang/json.lua
similarity index 100%
rename from lua/resources/lang/json.lua
rename to lua/plugins/lang/json.lua
diff --git a/lua/resources/lang/markdown.lua b/lua/plugins/lang/markdown.lua
similarity index 100%
rename from lua/resources/lang/markdown.lua
rename to lua/plugins/lang/markdown.lua
diff --git a/lua/resources/lang/nix.lua b/lua/plugins/lang/nix.lua
similarity index 100%
rename from lua/resources/lang/nix.lua
rename to lua/plugins/lang/nix.lua
diff --git a/lua/resources/lang/php.lua b/lua/plugins/lang/php.lua
similarity index 100%
rename from lua/resources/lang/php.lua
rename to lua/plugins/lang/php.lua
diff --git a/lua/resources/lang/python.lua b/lua/plugins/lang/python.lua
similarity index 100%
rename from lua/resources/lang/python.lua
rename to lua/plugins/lang/python.lua
diff --git a/lua/resources/lang/rust.lua b/lua/plugins/lang/rust.lua
similarity index 100%
rename from lua/resources/lang/rust.lua
rename to lua/plugins/lang/rust.lua
diff --git a/lua/resources/lang/typescript.lua b/lua/plugins/lang/typescript.lua
similarity index 100%
rename from lua/resources/lang/typescript.lua
rename to lua/plugins/lang/typescript.lua
diff --git a/lua/resources/lsp.lua b/lua/plugins/lsp.lua
similarity index 89%
rename from lua/resources/lsp.lua
rename to lua/plugins/lsp.lua
index 0b0012d..cf779d3 100755
--- a/lua/resources/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -77,12 +77,12 @@ return {
       local Util = require("util")
       -- special attach lsp
       Util.on_attach(function(client, buffer)
-        require("config.lsp.keymaps").attach(client, buffer)
-        require("config.lsp.gitsigns").attach(client, buffer)
+        require("plugins.config.lsp.keymaps").attach(client, buffer)
+        require("plugins.config.lsp.gitsigns").attach(client, buffer)
       end)
 
       -- diagnostics
-      vim.diagnostic.config(require("config.lsp.diagnostics")["on"])
+      vim.diagnostic.config(require("plugins.config.lsp.diagnostics")["on"])
 
       local servers = opts.servers
       local ext_capabilites = vim.lsp.protocol.make_client_capabilities()
@@ -138,11 +138,20 @@ return {
       require("mason-lspconfig").setup_handlers({ setup })
     end,
   },
+  -- ─────────────────────────────────────────────────────────────────
+  --  Schema Store [lsp schema manager]
+  --  https://github.com/b0o/SchemaStore.nvim
+  "b0o/SchemaStore.nvim",
+  --─────────────────────────────────────────────────────────────────
 
   {
     "williamboman/mason.nvim",
     cmd = "Mason",
     opts = {
+      registries = {
+        "github:nvim-java/mason-registry",
+        "github:mason-org/mason-registry",
+      },
       ensure_installed = {
         -- LSPs
         "bash-language-server",
@@ -247,7 +256,23 @@ return {
       use_diagnostic_signs = false, -- enabling this will use the signs defined in your lsp client
     },
   },
-  -- formatters
+  -- ─────────────────────────────────────────────────────────────────
+  {
+    "zeioth/garbage-day.nvim",
+    event = "User BaseFile",
+    opts = {
+      aggressive_mode = false,
+      excluded_lsp_clients = {
+        "null-ls",
+        "jdtls",
+      },
+      grace_period = (60 * 15),
+      wakeup_delay = 3000,
+      notifications = false,
+      retries = 3,
+      timeout = 1000,
+    },
+  },
   {
     "nvimtools/none-ls.nvim",
     event = { "BufReadPre", "BufNewFile" },
diff --git a/lua/resources/settings.lua b/lua/plugins/settings.lua
similarity index 100%
rename from lua/resources/settings.lua
rename to lua/plugins/settings.lua
diff --git a/lua/resources/tools.lua b/lua/plugins/tools.lua
similarity index 96%
rename from lua/resources/tools.lua
rename to lua/plugins/tools.lua
index d2e305c..e183b38 100755
--- a/lua/resources/tools.lua
+++ b/lua/plugins/tools.lua
@@ -10,7 +10,7 @@ return {
     "loctvl842/compile-nvim",
     lazy = true,
     config = function()
-      require("config.compile")
+      require("plugins.config.compile")
     end,
   },
   --  ╞═══════════════════════════════════════════════════════════════╡
diff --git a/lua/resources/treesitter.lua b/lua/plugins/treesitter.lua
similarity index 87%
rename from lua/resources/treesitter.lua
rename to lua/plugins/treesitter.lua
index ac70e3a..a56940f 100755
--- a/lua/resources/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -21,7 +21,6 @@ return {
         "http",
         "javascript",
         "json",
-        "latex",
         "lua",
         "markdown",
         "markdown_inline",
@@ -92,6 +91,7 @@ return {
       end,
     },
   },
+--─────────────────────────────────────────────────────────────────
   {
     "HiPhish/rainbow-delimiters.nvim",
     init = function()
@@ -118,6 +118,7 @@ return {
       }
     end,
   },
+--─────────────────────────────────────────────────────────────────
   {
     "nvim-treesitter/nvim-treesitter-textobjects",
     config = function()
@@ -143,6 +144,7 @@ return {
       end
     end,
   },
+--─────────────────────────────────────────────────────────────────
   {
     "nvim-treesitter/nvim-treesitter-context",
     event = "BufRead",
diff --git a/lua/resources/ui.lua b/lua/plugins/ui.lua
similarity index 99%
rename from lua/resources/ui.lua
rename to lua/plugins/ui.lua
index d1a2eba..18982dc 100755
--- a/lua/resources/ui.lua
+++ b/lua/plugins/ui.lua
@@ -115,7 +115,7 @@ return {
       }
     end,
     config = function(_, opts)
-      local lualine_config = require("config.lualine")
+      local lualine_config = require("plugins.config.lualine")
       lualine_config.setup(opts)
       lualine_config.load()
     end,
@@ -274,7 +274,7 @@ return {
     dependencies = { { "nvim-tree/nvim-web-devicons" } },
     keys = { { "<leader>0", "<cmd>Dashboard<CR>", desc = "Dashboard" } },
     config = function()
-      require("config.dashboard")
+      require("plugins.config.dashboard")
     end,
   },
   -- ─────────────────────────────────────────────────────────────────
@@ -425,7 +425,7 @@ return {
       "anuvyklack/keymap-layer.nvim",
     },
     config = function()
-      require("config.hydra.hydra")
+      require("plugins.config.hydra.hydra")
     end,
   },
   -- ─────────────────────────────────────────────────────────────────
diff --git a/lua/resources/util.lua b/lua/plugins/util.lua
similarity index 100%
rename from lua/resources/util.lua
rename to lua/plugins/util.lua
diff --git a/lua/util.lua b/lua/util.lua
index 78122cc..53aeb80 100755
--- a/lua/util.lua
+++ b/lua/util.lua
@@ -5,16 +5,16 @@ M.root_patterns = { ".git", "lua", "package.json", "mvnw", "gradlew", "pom.xml",
 M.augroup = function(name)
   return vim.api.nvim_create_augroup("tlh_" .. name, { clear = true })
 end
-
+-- ─────────────────────────────────────────────────────────────────
 M.has = function(plugin)
   return require("lazy.core.config").plugins[plugin] ~= nil
 end
-
+-- ─────────────────────────────────────────────────────────────────
 function M.get_clients(...)
   local fn = vim.lsp.get_clients or vim.lsp.get_active_clients
   return fn(...)
 end
-
+-- ─────────────────────────────────────────────────────────────────
 --- @param on_attach fun(client, buffer)
 M.on_attach = function(on_attach)
   vim.api.nvim_create_autocmd("LspAttach", {
@@ -25,7 +25,7 @@ M.on_attach = function(on_attach)
     end,
   })
 end
-
+-- ─────────────────────────────────────────────────────────────────
 M.get_highlight_value = function(group)
   local found, hl = pcall(vim.api.nvim_get_hl_by_name, group, true)
   if not found then
@@ -37,7 +37,7 @@ M.get_highlight_value = function(group)
   end
   return hl_config
 end
-
+-- ─────────────────────────────────────────────────────────────────
 -- return plugin opts
 ---@param name string
 function M.opts(name)
@@ -113,7 +113,7 @@ M.telescope_theme = function(type)
     borderchars = M.generate_borderchars("thick", nil, { top = "█", top_left = "█", top_right = "█" }),
   })
 end
-
+-- ─────────────────────────────────────────────────────────────────
 ---@param builtin "find_files" | "live_grep" | "buffers"
 ---@param type "ivy" | "dropdown" | "cursor" | nil
 M.telescope = function(builtin, type, opts)
@@ -132,7 +132,7 @@ M.telescope = function(builtin, type, opts)
     require("telescope.builtin")[builtin](theme)
   end
 end
-
+-- ─────────────────────────────────────────────────────────────────
 ---@param name "autocmds" | "options" | "keymaps"
 M.load = function(name)
   local Util = require("lazy.core.util")
@@ -150,7 +150,7 @@ M.load = function(name)
     end,
   })
 end
-
+-- ─────────────────────────────────────────────────────────────────
 M.on_very_lazy = function(fn)
   vim.api.nvim_create_autocmd("User", {
     pattern = "VeryLazy",
@@ -159,7 +159,7 @@ M.on_very_lazy = function(fn)
     end,
   })
 end
-
+-- ─────────────────────────────────────────────────────────────────
 M.capabilities = function(ext)
   return vim.tbl_deep_extend(
     "force",
@@ -169,7 +169,7 @@ M.capabilities = function(ext)
     { textDocument = { foldingRange = { dynamicRegistration = false, lineFoldingOnly = true } } }
   )
 end
-
+-- ─────────────────────────────────────────────────────────────────
 M.notify = function(msg, level, opts)
   opts = opts or {}
   level = vim.log.levels[level:upper()]
@@ -186,7 +186,7 @@ M.notify = function(msg, level, opts)
     vim.notify(msg, level, nopts)
   end)
 end
-
+-- ─────────────────────────────────────────────────────────────────
 --- @param type "thin" | "thick" | "empty" | nil
 --- @param order "t-r-b-l-tl-tr-br-bl" | "tl-t-tr-r-bl-b-br-l" | nil
 --- @param opts BorderIcons | nil