diff --git a/.config/nvim/lua/plugins/extras/coding/annotation.lua b/.config/nvim/lua/plugins/extras/coding/annotation.lua
index eb632f54..e946d069 100644
--- a/.config/nvim/lua/plugins/extras/coding/annotation.lua
+++ b/.config/nvim/lua/plugins/extras/coding/annotation.lua
@@ -1,12 +1,10 @@
 return {
+  { import = "lazyvim.plugins.extras.coding.neogen" },
   {
     "danymat/neogen",
-    opts = {
-      snippet_engine = "luasnip",
-      enabled = true,
-    },
     -- stylua: ignore
     keys = {
+      { "<leader>a", "", desc = " annotation/snippets" },
       { "<leader>ad", function() require("neogen").generate() end, desc = "Default Annotation" },
       { "<leader>aC", function() require("neogen").generate({ type = "class" }) end, desc = "Class" },
       { "<leader>af", function() require("neogen").generate({ type = "func" }) end, desc = "Function" },
@@ -14,14 +12,6 @@ return {
       { "<leader>aF", function() require("neogen").generate({ type = "file" }) end, desc = "File" },
     },
   },
-  {
-    "folke/which-key.nvim",
-    opts = {
-      defaults = {
-        ["<leader>a"] = { name = " annotation/snippets" },
-      },
-    },
-  },
   {
     "Zeioth/dooku.nvim",
     cmd = { "DookuGenerate", "DookuOpen", "DookuAutoSetup" },
diff --git a/.config/nvim/lua/plugins/extras/editor/git/github.lua b/.config/nvim/lua/plugins/extras/editor/git/github-extended.lua
similarity index 97%
rename from .config/nvim/lua/plugins/extras/editor/git/github.lua
rename to .config/nvim/lua/plugins/extras/editor/git/github-extended.lua
index 06a5a6e1..2a98a13b 100644
--- a/.config/nvim/lua/plugins/extras/editor/git/github.lua
+++ b/.config/nvim/lua/plugins/extras/editor/git/github-extended.lua
@@ -1,6 +1,8 @@
 local prefix = "<leader>G"
 
 return {
+  { import = "lazyvim.plugins.extras.util.octo" },
+  { import = "plugins.extras.lang.git-extended" },
   {
     "williamboman/mason.nvim",
     opts = function(_, opts)
@@ -54,12 +56,6 @@ return {
   },
   {
     "pwntester/octo.nvim",
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      "nvim-telescope/telescope.nvim",
-      "nvim-tree/nvim-web-devicons",
-    },
-    cmd = { "Octo" },
     opts = {
       use_diagnostic_signs = true,
       mappings = {},