diff --git a/lazy-lock.json b/lazy-lock.json
index 23109ec..6dc2fd4 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -20,7 +20,7 @@
   "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "62f821a14e20f3f2ee358cd44d0b3d299a508e72" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" },
   "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
   "neotest": { "branch": "master", "commit": "862afb2a2219d9ca565f67416fb7003cc0f22c4f" },
@@ -33,7 +33,7 @@
   "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" },
   "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
-  "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" },
+  "nvim-lint": { "branch": "master", "commit": "fdb04e9285edefbe25a02a31a35e8fbb10fe054d" },
   "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" },
   "nvim-lspconfig": { "branch": "master", "commit": "61e5109c8cf24807e4ae29813a3a82b31821dd45" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
diff --git a/lua/dkelly/lazy.lua b/lua/dkelly/lazy.lua
index e22dc2c..f0950bc 100644
--- a/lua/dkelly/lazy.lua
+++ b/lua/dkelly/lazy.lua
@@ -1,23 +1,22 @@
 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",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath,
-  })
+	vim.fn.system({
+		"git",
+		"clone",
+		"--filter=blob:none",
+		"https://github.com/folke/lazy.nvim.git",
+		"--branch=stable", -- latest stable release
+		lazypath,
+	})
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("lazy").setup({ { import = "dkelly.plugins" }, { import = "dkelly.plugins.lsp" } }, {
-  checker = {
-    enabled = true,
-    notify = false,
-  },
-  change_detection = {
-    notify = false,
-  },
+require("lazy").setup({ { import = "dkelly.plugins" } }, {
+	checker = {
+		enabled = true,
+		notify = false,
+	},
+	change_detection = {
+		notify = false,
+	},
 })
-
diff --git a/lua/dkelly/plugins/lsp/lspconfig.lua b/lua/dkelly/plugins/lspconfig.lua
similarity index 94%
rename from lua/dkelly/plugins/lsp/lspconfig.lua
rename to lua/dkelly/plugins/lspconfig.lua
index 4c46f5c..4eeaa30 100644
--- a/lua/dkelly/plugins/lsp/lspconfig.lua
+++ b/lua/dkelly/plugins/lspconfig.lua
@@ -9,13 +9,6 @@ return {
 	config = function()
 		-- import lspconfig plugin
 		local lspconfig = require("lspconfig")
-		lspconfig.util.default_config = vim.tbl_extend("force", lspconfig.util.default_config, {
-			capabilities = vim.tbl_deep_extend(
-				"force",
-				vim.lsp.protocol.make_client_capabilities(),
-				require("lsp-file-operations").default_capabilities()
-			),
-		})
 		lspconfig.dartls.setup({})
 		-- import cmp-nvim-lsp plugin
 		local cmp_nvim_lsp = require("cmp_nvim_lsp")
@@ -117,11 +110,6 @@ return {
 		end
 
 		require("mason-lspconfig").setup({
-			ensure_installed = {
-				"lua_ls",
-				"rust_analyzer",
-				"gopls",
-			},
 			handlers = {
 				function(server_name) -- default handler (optional)
 					require("lspconfig")[server_name].setup({
@@ -166,7 +154,7 @@ return {
 				["gopls"] = function()
 					lspconfig.gopls.setup({
 						on_attach = on_attach,
-						capabilities = capabilities,
+						capabilities = cmp_nvim_lsp.default_capabilities(),
 						cmd = { "gopls" },
 						filetypes = { "go", "gomod", "gowork", "gotmpl" },
 						root_dir = lspconfig.util.root_pattern("go.work", "go.mod", ".git"),
diff --git a/lua/dkelly/plugins/lsp/mason.lua b/lua/dkelly/plugins/mason.lua
similarity index 98%
rename from lua/dkelly/plugins/lsp/mason.lua
rename to lua/dkelly/plugins/mason.lua
index 0e28192..d45709b 100644
--- a/lua/dkelly/plugins/lsp/mason.lua
+++ b/lua/dkelly/plugins/mason.lua
@@ -10,8 +10,6 @@ return {
 		-- import mason
 		local mason = require("mason")
 
-		-- import mason-lspconfig
-
 		local mason_tool_installer = require("mason-tool-installer")
 		-- enable mason and configure icons
 		mason.setup({