diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index c6b0eb8..55b8979 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,2 +1 @@
-require("settings")
 require("config.lazy")
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
new file mode 100644
index 0000000..6285ae0
--- /dev/null
+++ b/.config/nvim/lazy-lock.json
@@ -0,0 +1,58 @@
+{
+  "Comment.nvim": { "branch": "master", "commit": "418d3117dab2f54c4340ea73e0070dd78fc81753" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" },
+  "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
+  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-tmux": { "branch": "main", "commit": "984772716f66d8ee88535a6bf3f94c4b4e1301f5" },
+  "colorbuddy.vim": { "branch": "master", "commit": "cdb5b0654d3cafe61d2a845e15b2b4b0e78e752a" },
+  "copilot-cmp": { "branch": "master", "commit": "b732a58ac8b7287b981cd9f0d9c0f61e5e9d5760" },
+  "copilot.lua": { "branch": "master", "commit": "137df557486f91627b8e4708a47088f36950f12c" },
+  "gitsigns.nvim": { "branch": "main", "commit": "4bd5d7702c17643ff40c035b6b936757b99743c7" },
+  "go.nvim": { "branch": "master", "commit": "4977d3165d6ee8a06781f7b3443484fe7e91c9a3" },
+  "hlargs.nvim": { "branch": "main", "commit": "88b925d699fb39633cdda02c24f0b3ba5d0e6964" },
+  "inc-rename.nvim": { "branch": "main", "commit": "21c23c379342a731a0c90f226601ec0434627b26" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "8299fe7703dfff4b1752aeed271c3b95281a952d" },
+  "lazy.nvim": { "branch": "main", "commit": "8aa90c34233f7de420b326de361137a571827d8c" },
+  "lsp_lines.nvim": { "branch": "main", "commit": "ec98b45c8280e5ef8c84028d4f38aa447276c002" },
+  "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
+  "lualine.nvim": { "branch": "master", "commit": "0050b308552e45f7128f399886c86afefc3eb988" },
+  "lush.nvim": { "branch": "main", "commit": "b1e8eb1da3fee95ef31515a73c9eff9bf251088d" },
+  "marks.nvim": { "branch": "master", "commit": "c3b18b97912720a6586fb537c5c0dfc9e06a68f1" },
+  "neogen": { "branch": "main", "commit": "465af9d6c6fb7f360175991dcc23fc10917e3a06" },
+  "noice.nvim": { "branch": "main", "commit": "d8a1f3056ad713b5d471048f8d029264828e22c0" },
+  "nui.nvim": { "branch": "main", "commit": "d147222a1300901656f3ebd5b95f91732785a329" },
+  "null-ls.nvim": { "branch": "main", "commit": "9d811bb6ed44cf766f4bda8a47fd65fdfbdcaa7d" },
+  "nvim-cmp": { "branch": "main", "commit": "aae0c3e4e778ca4be6fabc52e388cbd5b844b7a5" },
+  "nvim-dap": { "branch": "master", "commit": "401f5f22b2d7f9bdbb9294d0235136091458816a" },
+  "nvim-dap-go": { "branch": "main", "commit": "b4ded7de579b4e2a85c203388233b54bf1028816" },
+  "nvim-dap-ui": { "branch": "master", "commit": "110193102b4840be8bda6eb2358367026145ae3a" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "7f7f2af549e72a0b7bddc3b4f827beb027ea8ce3" },
+  "nvim-lsp-ts-utils": { "branch": "main", "commit": "0a6a16ef292c9b61eac6dad00d52666c7f84b0e7" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9b8f5260f3e793e2dcb2899e0a5b944667a95cb2" },
+  "nvim-navic": { "branch": "master", "commit": "7e9d2b2b601149fecdccd11b516acb721e571fe6" },
+  "nvim-osc52": { "branch": "main", "commit": "27da4724a887dabed3768b41fa51c785cb62ef26" },
+  "nvim-treesitter": { "branch": "master", "commit": "4db66966720541c2286dc7451be3c8ff9f273bb9" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "fcd764507f723903af5507e141ea593e855b504a" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" },
+  "nvim-web-devicons": { "branch": "master", "commit": "bb6d4fd1e010300510172b173ab5205d37af084f" },
+  "packer.nvim": { "branch": "master", "commit": "1d0cf98a561f7fd654c970c49f917d74fafe1530" },
+  "playground": { "branch": "master", "commit": "c481c660fa903a0e295902b1765ecfbd6e76a556" },
+  "plenary.nvim": { "branch": "master", "commit": "9a0d3bf7b832818c042aaf30f692b081ddd58bd9" },
+  "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
+  "refactoring.nvim": { "branch": "master", "commit": "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a" },
+  "stylua-nvim": { "branch": "main", "commit": "ce59a353f02938cba3e0285e662fcd3901cd270f" },
+  "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" },
+  "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
+  "telescope-github.nvim": { "branch": "master", "commit": "ee95c509901c3357679e9f2f9eaac3561c811736" },
+  "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
+  "telescope.nvim": { "branch": "master", "commit": "203bf5609137600d73e8ed82703d6b0e320a5f36" },
+  "trouble.nvim": { "branch": "main", "commit": "556ef3089709a6e253df1e500381fec5eb48e48a" },
+  "vim-cue": { "branch": "master", "commit": "bd1a62303d096aa24fe4160a475645087f8770b3" },
+  "vim-illuminate": { "branch": "master", "commit": "49062ab1dd8fec91833a69f0a1344223dd59d643" },
+  "yanky.nvim": { "branch": "main", "commit": "100150704104db1930519eb2a05e5aee6d00f553" },
+  "zenbones.nvim": { "branch": "main", "commit": "910b8c240c6aaf5263db038db81c538602c766c3" }
+}
\ No newline at end of file
diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua
index aad855e..35cc1c7 100644
--- a/.config/nvim/lua/config/lazy.lua
+++ b/.config/nvim/lua/config/lazy.lua
@@ -1,14 +1,33 @@
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "--single-branch",
-    "https://github.com/folke/lazy.nvim.git",
-    lazypath,
-  })
+	vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", lazypath })
+	vim.fn.system({ "git", "-C", lazypath, "checkout", "tags/stable" }) -- last stable release
 end
 vim.opt.runtimepath:prepend(lazypath)
 
-require("lazy").setup("config.plugins")
+require("lazy").setup({
+	spec = {
+		{ import = "plugins" },
+	},
+	defaults = { lazy = true },
+	checker = { enabled = true },
+	performance = {
+		cache = {
+			enabled = true,
+		},
+		rtp = {
+			disabled_plugins = {
+				"gzip",
+				"matchit",
+				"matchparen",
+				"netrwPlugin",
+				"rplugin",
+				"tarPlugin",
+				"tohtml",
+				"tutor",
+				"zipPlugin",
+			},
+		},
+	},
+	debug = false,
+})
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/config/options.lua
similarity index 100%
rename from .config/nvim/lua/settings.lua
rename to .config/nvim/lua/config/options.lua
diff --git a/.config/nvim/lua/config/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/cmp.lua
rename to .config/nvim/lua/plugins/cmp.lua
diff --git a/.config/nvim/lua/config/plugins/copilot.lua b/.config/nvim/lua/plugins/copilot.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/copilot.lua
rename to .config/nvim/lua/plugins/copilot.lua
diff --git a/.config/nvim/lua/config/plugins/dap.lua b/.config/nvim/lua/plugins/dap.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/dap.lua
rename to .config/nvim/lua/plugins/dap.lua
diff --git a/.config/nvim/lua/config/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/gitsigns.lua
rename to .config/nvim/lua/plugins/gitsigns.lua
diff --git a/.config/nvim/lua/config/plugins/illuminate.lua b/.config/nvim/lua/plugins/illuminate.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/illuminate.lua
rename to .config/nvim/lua/plugins/illuminate.lua
diff --git a/.config/nvim/lua/config/plugins/indent-blankline.lua b/.config/nvim/lua/plugins/indent-blankline.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/indent-blankline.lua
rename to .config/nvim/lua/plugins/indent-blankline.lua
diff --git a/.config/nvim/lua/config/plugins/lsp-config.lua b/.config/nvim/lua/plugins/lsp-config.lua
similarity index 99%
rename from .config/nvim/lua/config/plugins/lsp-config.lua
rename to .config/nvim/lua/plugins/lsp-config.lua
index 4cbf247..089690f 100644
--- a/.config/nvim/lua/config/plugins/lsp-config.lua
+++ b/.config/nvim/lua/plugins/lsp-config.lua
@@ -57,7 +57,7 @@ function M.config()
 		"jsonls",
 		-- "sql",
 		"pyright",
-		"sumneko_lua",
+		"lua_ls",
 		"terraformls",
 		"yamlls",
 	}
@@ -85,7 +85,7 @@ function M.config()
 		},
 	})
 
-	lspconfig.sumneko_lua.setup({
+	lspconfig.lua_ls.setup({
 		on_attach = function(client, bufnr)
 			on_attach(client, bufnr)
 			vim.cmd([[autocmd BufWritePre <buffer> lua require'stylua-nvim'.format_file()]])
diff --git a/.config/nvim/lua/config/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/lualine.lua
rename to .config/nvim/lua/plugins/lualine.lua
diff --git a/.config/nvim/lua/config/plugins/marks.lua b/.config/nvim/lua/plugins/marks.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/marks.lua
rename to .config/nvim/lua/plugins/marks.lua
diff --git a/.config/nvim/lua/config/plugins/init.lua b/.config/nvim/lua/plugins/misc.lua
similarity index 76%
rename from .config/nvim/lua/config/plugins/init.lua
rename to .config/nvim/lua/plugins/misc.lua
index 4fab742..5cde493 100644
--- a/.config/nvim/lua/config/plugins/init.lua
+++ b/.config/nvim/lua/plugins/misc.lua
@@ -36,6 +36,54 @@ return {
 		},
 	},
 
+	{
+		"danymat/neogen",
+		keys = {
+			{
+				"<leader>cc",
+				function()
+					require("neogen").generate({})
+				end,
+				desc = "Neogen Comment",
+			},
+		},
+		opts = { snippet_engine = "luasnip" },
+	},
+
+	{
+		"ThePrimeagen/refactoring.nvim",
+		keys = {
+			{
+				"<leader>r",
+				function()
+					require("refactoring").select_refactor()
+				end,
+				mode = "v",
+				noremap = true,
+				silent = true,
+				expr = false,
+			},
+		},
+		opts = {},
+	},
+
+	{
+		"ThePrimeagen/refactoring.nvim",
+		keys = {
+			{
+				"<leader>r",
+				function()
+					require("refactoring").select_refactor()
+				end,
+				mode = "v",
+				noremap = true,
+				silent = true,
+				expr = false,
+			},
+		},
+		opts = {},
+	},
+
 	{
 		"smjonas/inc-rename.nvim",
 		cmd = "IncRename",
diff --git a/.config/nvim/lua/config/plugins/noice.lua b/.config/nvim/lua/plugins/noice.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/noice.lua
rename to .config/nvim/lua/plugins/noice.lua
diff --git a/.config/nvim/lua/config/plugins/null-ls.lua b/.config/nvim/lua/plugins/null-ls.lua
similarity index 89%
rename from .config/nvim/lua/config/plugins/null-ls.lua
rename to .config/nvim/lua/plugins/null-ls.lua
index 1176d75..1a74e9c 100644
--- a/.config/nvim/lua/config/plugins/null-ls.lua
+++ b/.config/nvim/lua/plugins/null-ls.lua
@@ -16,6 +16,7 @@ function M.config()
 			builtins.formatting.sqlfluff,
 			builtins.formatting.buildifier,
 			builtins.completion.spell,
+			builtins.code_actions.eslint_d,
 			builtins.diagnostics.buf.with({
 				args = { "lint", "--disable-symlinks", "--path", "$FILENAME" },
 				cwd = function()
@@ -28,6 +29,8 @@ function M.config()
 			}),
 			builtins.diagnostics.buildifier,
 			builtins.diagnostics.cue_fmt,
+			builtins.diagnostics.golangci_lint,
+			builtins.diagnostics.eslint_d,
 		},
 		debug = true,
 	})
diff --git a/.config/nvim/lua/config/plugins/osc52.lua b/.config/nvim/lua/plugins/osc52.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/osc52.lua
rename to .config/nvim/lua/plugins/osc52.lua
diff --git a/.config/nvim/lua/config/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/telescope.lua
rename to .config/nvim/lua/plugins/telescope.lua
diff --git a/.config/nvim/lua/config/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/treesitter.lua
rename to .config/nvim/lua/plugins/treesitter.lua
diff --git a/.config/nvim/lua/config/plugins/yanky.lua b/.config/nvim/lua/plugins/yanky.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/yanky.lua
rename to .config/nvim/lua/plugins/yanky.lua
diff --git a/.config/nvim/lua/config/plugins/zenbones.lua b/.config/nvim/lua/plugins/zenbones.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins/zenbones.lua
rename to .config/nvim/lua/plugins/zenbones.lua