diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index 5d00dfad..85c7f89e 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -15,15 +15,15 @@
     "plugins.extras.coding.treesitter.puppeteer",
     "plugins.extras.coding.treesitter.various-textobjs",
     "plugins.extras.coding.yanky",
-    "plugins.extras.dap.core",
+    "plugins.extras.dap.core-extended",
     "plugins.extras.dap.persistent-breakpoints",
     "plugins.extras.editor.color",
     "plugins.extras.editor.compiler",
     "plugins.extras.editor.docs.devdocs",
     "plugins.extras.editor.docs.obsidian",
     "plugins.extras.editor.git.diffview",
-    "plugins.extras.editor.grapple",
     "plugins.extras.editor.live-server",
+    "plugins.extras.editor.marks.grapple",
     "plugins.extras.editor.outline-extended",
     "plugins.extras.editor.package-info",
     "plugins.extras.editor.search-replace",
diff --git a/.config/nvim/lua/plugins/extras/dap/core.lua b/.config/nvim/lua/plugins/extras/dap/core-extended.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/dap/core.lua
rename to .config/nvim/lua/plugins/extras/dap/core-extended.lua
diff --git a/.config/nvim/lua/plugins/extras/editor/arrow.lua b/.config/nvim/lua/plugins/extras/editor/marks/arrow.lua
similarity index 98%
rename from .config/nvim/lua/plugins/extras/editor/arrow.lua
rename to .config/nvim/lua/plugins/extras/editor/marks/arrow.lua
index 608e13ac..129a0aba 100644
--- a/.config/nvim/lua/plugins/extras/editor/arrow.lua
+++ b/.config/nvim/lua/plugins/extras/editor/marks/arrow.lua
@@ -17,6 +17,7 @@ return {
   },
   {
     "nvim-lualine/lualine.nvim",
+    optional = true,
     opts = function(_, opts)
       table.insert(opts.sections.lualine_c, require("arrow.statusline").text_for_statusline_with_icons())
     end,
diff --git a/.config/nvim/lua/plugins/extras/editor/grapple.lua b/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua
similarity index 99%
rename from .config/nvim/lua/plugins/extras/editor/grapple.lua
rename to .config/nvim/lua/plugins/extras/editor/marks/grapple.lua
index 02de0e0e..ed4617f9 100644
--- a/.config/nvim/lua/plugins/extras/editor/grapple.lua
+++ b/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua
@@ -62,6 +62,7 @@ return {
   },
   {
     "nvim-lualine/lualine.nvim",
+    optional = true,
     opts = function(_, opts)
       table.insert(opts.sections.lualine_c, { require("grapple").statusline, cond = require("grapple").exists })
     end,
diff --git a/.config/nvim/lua/plugins/extras/editor/harpoon.lua b/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/editor/harpoon.lua
rename to .config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua
diff --git a/.config/nvim/lua/plugins/extras/test/core.lua b/.config/nvim/lua/plugins/extras/test/core-extended.lua
similarity index 100%
rename from .config/nvim/lua/plugins/extras/test/core.lua
rename to .config/nvim/lua/plugins/extras/test/core-extended.lua