diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 59230747..f7a9f926 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -118,7 +118,6 @@
   "satellite.nvim": { "branch": "main", "commit": "7911fa8137c77258ba509ba875ea52c6d59737e8" },
   "semshi": { "branch": "master", "commit": "eddc5304d7aa99e140c89f40393c9f109f4e9115" },
   "smart-splits.nvim": { "branch": "master", "commit": "c8a9173d70cbbd1f6e4a414e49e31df2b32a1362" },
-  "sniprun": { "branch": "master", "commit": "7a8bc30fcf04fd4efec43be368f12eb4266fabf6" },
   "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" },
   "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index fa8dcfe5..7bc15c4d 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -21,53 +21,54 @@
     "lazyvim.plugins.extras.ui.alpha",
     "lazyvim.plugins.extras.util.dot",
     "lazyvim.plugins.extras.vscode",
+    "plugins.extras.coding.ai.codeium",
+    "plugins.extras.coding.ai.gpt",
     "plugins.extras.coding.annotation",
-    "plugins.extras.coding.codeium",
-    "plugins.extras.coding.debugprint",
+    "plugins.extras.coding.debug.debugprint",
     "plugins.extras.coding.dial",
-    "plugins.extras.coding.endwise",
-    "plugins.extras.coding.gpt",
     "plugins.extras.coding.multicursor",
-    "plugins.extras.coding.puppeteer",
     "plugins.extras.coding.refactoring",
-    "plugins.extras.coding.treesj",
+    "plugins.extras.coding.treesitter.endwise",
+    "plugins.extras.coding.treesitter.mini-align",
+    "plugins.extras.coding.treesitter.puppeteer",
+    "plugins.extras.coding.treesitter.treesj",
     "plugins.extras.dap.persistent-breakpoints",
     "plugins.extras.editor.color",
-    "plugins.extras.editor.devdocs",
-    "plugins.extras.editor.diffview",
-    "plugins.extras.editor.git-conflict",
-    "plugins.extras.editor.github",
+    "plugins.extras.editor.docs.devdocs",
+    "plugins.extras.editor.git.diffview",
+    "plugins.extras.editor.git.git-conflict",
+    "plugins.extras.editor.git.github",
+    "plugins.extras.editor.git.worktree",
     "plugins.extras.editor.harpoon",
     "plugins.extras.editor.live-server",
-    "plugins.extras.editor.mini-align",
+    "plugins.extras.editor.numb",
     "plugins.extras.editor.package-info",
+    "plugins.extras.editor.rayso",
     "plugins.extras.editor.regex",
-    "plugins.extras.editor.repo",
     "plugins.extras.editor.rest-client",
     "plugins.extras.editor.smart-splits",
-    "plugins.extras.editor.undotree",
+    "plugins.extras.editor.suda",
+    "plugins.extras.editor.telescope.repo",
+    "plugins.extras.editor.telescope.undotree",
     "plugins.extras.editor.winshift",
-    "plugins.extras.editor.worktree",
     "plugins.extras.formatting.isort",
     "plugins.extras.formatting.rustfmt",
     "plugins.extras.formatting.rustywind",
     "plugins.extras.formatting.sqlfmt",
     "plugins.extras.lang.bash",
-    "plugins.extras.lang.css",
     "plugins.extras.lang.git",
-    "plugins.extras.lang.html",
     "plugins.extras.lang.markdown-extended",
     "plugins.extras.lang.python-extended",
     "plugins.extras.lang.sql",
-    "plugins.extras.lang.tailwindcss-extended",
-    "plugins.extras.lang.typescript-extended",
+    "plugins.extras.lang.web.css",
+    "plugins.extras.lang.web.html",
+    "plugins.extras.lang.web.typescript-extended",
     "plugins.extras.linting.pylint",
     "plugins.extras.linting.shellcheck",
     "plugins.extras.lsp.compiler",
     "plugins.extras.lsp.lens",
     "plugins.extras.lsp.lightbulb",
     "plugins.extras.lsp.lsp-extended",
-    "plugins.extras.lsp.repl",
     "plugins.extras.lsp.timeout",
     "plugins.extras.ui.alpha",
     "plugins.extras.ui.block",
@@ -79,15 +80,12 @@
     "plugins.extras.ui.number-toggle",
     "plugins.extras.ui.rainbow-delimeters",
     "plugins.extras.ui.scrollbar",
+    "plugins.extras.ui.smooth-scrolling",
     "plugins.extras.ui.transparent",
     "plugins.extras.ui.windows",
     "plugins.extras.ui.zen-mode",
     "plugins.extras.util.bigfile",
     "plugins.extras.util.discordrcp",
-    "plugins.extras.util.numb",
-    "plugins.extras.util.rayso",
-    "plugins.extras.util.smooth-scrolling",
-    "plugins.extras.util.suda",
     "plugins.extras.util.vim-be-good",
     "plugins.extras.util.wakatime"
   ],
@@ -95,5 +93,4 @@
     "NEWS.md": "2123"
   },
   "version": 2
-}
-
+}
\ No newline at end of file
diff --git a/.config/nvim/lua/plugins/extras/coding/codeium.lua b/.config/nvim/lua/plugins/extras/coding/ai/codeium.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/coding/codeium.lua
rename to .config/nvim/lua/plugins/extras/coding/ai/codeium.lua
diff --git a/.config/nvim/lua/plugins/extras/coding/copilot.lua b/.config/nvim/lua/plugins/extras/coding/ai/copilot.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/coding/copilot.lua
rename to .config/nvim/lua/plugins/extras/coding/ai/copilot.lua
diff --git a/.config/nvim/lua/plugins/extras/coding/gpt.lua b/.config/nvim/lua/plugins/extras/coding/ai/gpt.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/coding/gpt.lua
rename to .config/nvim/lua/plugins/extras/coding/ai/gpt.lua
diff --git a/.config/nvim/lua/plugins/extras/coding/debugprint.lua b/.config/nvim/lua/plugins/extras/coding/debugprint.lua
deleted file mode 100644
index a949625e..00000000
--- a/.config/nvim/lua/plugins/extras/coding/debugprint.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-  "andrewferrier/debugprint.nvim",
-  opts = {},
-  lazy = false,
-}
diff --git a/.config/nvim/lua/plugins/extras/coding/endwise.lua b/.config/nvim/lua/plugins/extras/coding/treesitter/endwise.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/coding/endwise.lua
rename to .config/nvim/lua/plugins/extras/coding/treesitter/endwise.lua
diff --git a/.config/nvim/lua/plugins/extras/editor/mini-align.lua b/.config/nvim/lua/plugins/extras/coding/treesitter/mini-align.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/editor/mini-align.lua
rename to .config/nvim/lua/plugins/extras/coding/treesitter/mini-align.lua
diff --git a/.config/nvim/lua/plugins/extras/coding/puppeteer.lua b/.config/nvim/lua/plugins/extras/coding/treesitter/puppeteer.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/coding/puppeteer.lua
rename to .config/nvim/lua/plugins/extras/coding/treesitter/puppeteer.lua
diff --git a/.config/nvim/lua/plugins/extras/coding/spider.lua b/.config/nvim/lua/plugins/extras/coding/treesitter/spider.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/coding/spider.lua
rename to .config/nvim/lua/plugins/extras/coding/treesitter/spider.lua
diff --git a/.config/nvim/lua/plugins/extras/coding/treesj.lua b/.config/nvim/lua/plugins/extras/coding/treesitter/treesj.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/coding/treesj.lua
rename to .config/nvim/lua/plugins/extras/coding/treesitter/treesj.lua
diff --git a/.config/nvim/lua/plugins/extras/coding/wildfire.lua b/.config/nvim/lua/plugins/extras/coding/treesitter/wildfire.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/coding/wildfire.lua
rename to .config/nvim/lua/plugins/extras/coding/treesitter/wildfire.lua
diff --git a/.config/nvim/lua/plugins/extras/editor/devdocs.lua b/.config/nvim/lua/plugins/extras/editor/docs/devdocs.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/editor/devdocs.lua
rename to .config/nvim/lua/plugins/extras/editor/docs/devdocs.lua
diff --git a/.config/nvim/lua/plugins/extras/editor/neorg.lua b/.config/nvim/lua/plugins/extras/editor/docs/neorg.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/editor/neorg.lua
rename to .config/nvim/lua/plugins/extras/editor/docs/neorg.lua
diff --git a/.config/nvim/lua/plugins/extras/editor/obsidian.lua b/.config/nvim/lua/plugins/extras/editor/docs/obsidian.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/editor/obsidian.lua
rename to .config/nvim/lua/plugins/extras/editor/docs/obsidian.lua
diff --git a/.config/nvim/lua/plugins/extras/editor/diffview.lua b/.config/nvim/lua/plugins/extras/editor/git/diffview.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/editor/diffview.lua
rename to .config/nvim/lua/plugins/extras/editor/git/diffview.lua
diff --git a/.config/nvim/lua/plugins/extras/editor/git-conflict.lua b/.config/nvim/lua/plugins/extras/editor/git/git-conflict.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/editor/git-conflict.lua
rename to .config/nvim/lua/plugins/extras/editor/git/git-conflict.lua
diff --git a/.config/nvim/lua/plugins/extras/editor/github.lua b/.config/nvim/lua/plugins/extras/editor/git/github.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/editor/github.lua
rename to .config/nvim/lua/plugins/extras/editor/git/github.lua
diff --git a/.config/nvim/lua/plugins/extras/editor/worktree.lua b/.config/nvim/lua/plugins/extras/editor/git/worktree.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/editor/worktree.lua
rename to .config/nvim/lua/plugins/extras/editor/git/worktree.lua
diff --git a/.config/nvim/lua/plugins/extras/util/numb.lua b/.config/nvim/lua/plugins/extras/editor/numb.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/util/numb.lua
rename to .config/nvim/lua/plugins/extras/editor/numb.lua
diff --git a/.config/nvim/lua/plugins/extras/util/rayso.lua b/.config/nvim/lua/plugins/extras/editor/rayso.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/util/rayso.lua
rename to .config/nvim/lua/plugins/extras/editor/rayso.lua
diff --git a/.config/nvim/lua/plugins/extras/util/suda.lua b/.config/nvim/lua/plugins/extras/editor/suda.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/util/suda.lua
rename to .config/nvim/lua/plugins/extras/editor/suda.lua
diff --git a/.config/nvim/lua/plugins/extras/editor/repo.lua b/.config/nvim/lua/plugins/extras/editor/telescope/repo.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/editor/repo.lua
rename to .config/nvim/lua/plugins/extras/editor/telescope/repo.lua
diff --git a/.config/nvim/lua/plugins/extras/editor/undotree.lua b/.config/nvim/lua/plugins/extras/editor/telescope/undotree.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/editor/undotree.lua
rename to .config/nvim/lua/plugins/extras/editor/telescope/undotree.lua
diff --git a/.config/nvim/lua/plugins/extras/lang/astro.lua b/.config/nvim/lua/plugins/extras/lang/web/astro.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/lang/astro.lua
rename to .config/nvim/lua/plugins/extras/lang/web/astro.lua
diff --git a/.config/nvim/lua/plugins/extras/lang/css.lua b/.config/nvim/lua/plugins/extras/lang/web/css.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/lang/css.lua
rename to .config/nvim/lua/plugins/extras/lang/web/css.lua
diff --git a/.config/nvim/lua/plugins/extras/lang/html.lua b/.config/nvim/lua/plugins/extras/lang/web/html.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/lang/html.lua
rename to .config/nvim/lua/plugins/extras/lang/web/html.lua
diff --git a/.config/nvim/lua/plugins/extras/lang/php.lua b/.config/nvim/lua/plugins/extras/lang/web/php.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/lang/php.lua
rename to .config/nvim/lua/plugins/extras/lang/web/php.lua
diff --git a/.config/nvim/lua/plugins/extras/lang/svelte.lua b/.config/nvim/lua/plugins/extras/lang/web/svelte.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/lang/svelte.lua
rename to .config/nvim/lua/plugins/extras/lang/web/svelte.lua
diff --git a/.config/nvim/lua/plugins/extras/lang/tailwindcss-extended.lua b/.config/nvim/lua/plugins/extras/lang/web/tailwindcss-extended.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/lang/tailwindcss-extended.lua
rename to .config/nvim/lua/plugins/extras/lang/web/tailwindcss-extended.lua
diff --git a/.config/nvim/lua/plugins/extras/lang/typescript-extended.lua b/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/lang/typescript-extended.lua
rename to .config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua
diff --git a/.config/nvim/lua/plugins/extras/lang/vue.lua b/.config/nvim/lua/plugins/extras/lang/web/vue.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/lang/vue.lua
rename to .config/nvim/lua/plugins/extras/lang/web/vue.lua
diff --git a/.config/nvim/lua/plugins/extras/lsp/repl.lua b/.config/nvim/lua/plugins/extras/lsp/repl.lua
deleted file mode 100644
index 05892c56..00000000
--- a/.config/nvim/lua/plugins/extras/lsp/repl.lua
+++ /dev/null
@@ -1,78 +0,0 @@
-return {
-  {
-    "michaelb/sniprun",
-    run = "bash ./install.sh",
-    cmd = { "SnipRun", "SnipInfo", "SnipLive", "SnipClose", "SnipReset", "SnipReplMemoryClean" },
-    opts = {
-
-      selected_interpreters = {}, --# use those instead of the default for the current filetype
-      repl_enable = { "javascript", "typescript" }, --# enable REPL-like behavior for the given interpreters
-      repl_disable = {}, --# disable REPL-like behavior for the given interpreters
-
-      interpreter_options = {
-        --# interpreter-specific options, see docs / :SnipInfo <name>
-
-        --# use the interpreter name as key
-        GFM_original = {
-          use_on_filetypes = { "markdown.pandoc" }, --# the 'use_on_filetypes' configuration key is
-          --# available for every interpreter
-        },
-        Python3_original = {
-          error_truncate = "auto", --# Truncate runtime errors 'long', 'short' or 'auto'
-          --# the hint is available for every interpreter
-          --# but may not be always respected
-        },
-      },
-
-      --# you can combo different display modes as desired and with the 'Ok' or 'Err' suffix
-      --# to filter only sucessful runs (or errored-out runs respectively)
-      display = {
-        -- "Classic", --# display results in the command-line  area
-        -- "VirtualTextOk", --# display ok results as virtual text (multiline is shortened)
-
-        "VirtualText", --# display results as virtual text
-        -- "TempFloatingWindow",      --# display results in a floating window
-        -- "LongTempFloatingWindow",  --# same as above, but only long results. To use with VirtualText[Ok/Err]
-        -- "Terminal", --# display results in a vertical split
-        -- "TerminalWithCode", --# display results and code history in a vertical split
-        -- "NvimNotify",              --# display with the nvim-notify plugin
-        -- "Api"                      --# return output to a programming interface
-      },
-
-      live_display = { "VirtualTextOk" }, --# display mode used in live_mode
-
-      display_options = {
-        terminal_scrollback = vim.o.scrollback, --# change terminal display scrollback lines
-        terminal_line_number = false, --# whether show line number in terminal window
-        terminal_signcolumn = false, --# whether show signcolumn in terminal window
-        terminal_persistence = true, --# always keep the terminal open (true) or close it at every occasion (false)
-        terminal_width = 45, --# change the terminal display option width
-        notification_timeout = 5, --# timeout for nvim_notify output
-      },
-
-      --# You can use the same keys to customize whether a sniprun producing
-      --# no output should display nothing or '(no output)'
-      show_no_output = {
-        "Classic",
-        "TempFloatingWindow", --# implies LongTempFloatingWindow, which has no effect on its own
-      },
-
-      --# customize highlight groups (setting this overrides colorscheme)
-      -- snipruncolors = {
-      --   SniprunVirtualTextOk = { bg = "#66eeff", fg = "#000000", ctermbg = "Cyan", cterfg = "Black" },
-      --   SniprunFloatingWinOk = { fg = "#66eeff", ctermfg = "Cyan" },
-      --   SniprunVirtualTextErr = { bg = "#881515", fg = "#000000", ctermbg = "DarkRed", cterfg = "Black" },
-      --   SniprunFloatingWinErr = { fg = "#881515", ctermfg = "DarkRed" },
-      -- },
-
-      live_mode_toggle = "off", --# live mode toggle, see Usage - Running for more info
-
-      --# miscellaneous compatibility/adjustement settings
-      inline_messages = false, --# inline_message (0/1) is a one-line way to display messages
-      --# to workaround sniprun not being able to display anything
-
-      borders = "single", --# display borders around floating windows
-      --# possible values are 'none', 'single', 'double', or 'shadow'
-    },
-  },
-}
diff --git a/.config/nvim/lua/plugins/extras/util/smooth-scrolling.lua b/.config/nvim/lua/plugins/extras/ui/smooth-scrolling.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/util/smooth-scrolling.lua
rename to .config/nvim/lua/plugins/extras/ui/smooth-scrolling.lua