diff --git a/lua/config/init.lua b/lua/config/init.lua
index 239e2fe..3babd1e 100644
--- a/lua/config/init.lua
+++ b/lua/config/init.lua
@@ -12,7 +12,7 @@ require("config/telescope")
 require("config/which-key")
 require("config/nvim-cmp")
 require("config/mason")
-require("config/lsp/signs")
+require("config/lsp/lsp-signs")
 require("config/lsp/bash")
 require("config/lsp/lua")
 require("config/lsp/web")
diff --git a/lua/config/lsp/attach.lua b/lua/config/lsp/attach.lua
deleted file mode 100644
index 6040730..0000000
--- a/lua/config/lsp/attach.lua
+++ /dev/null
@@ -1,43 +0,0 @@
-return function()
-	local km = vim.keymap.set
-	local opts = {}
-
-	opts.desc = "show documentation under cursor"
-	km("n", "<leader>lK", vim.lsp.buf.hover, opts)
-
-	opts.desc = "show LSP References"
-	km("n", "<leader>lR", ":Telescope lsp_references<cr>", opts)
-
-	opts.desc = "go to declaration"
-	km("n", "<leader>lD", "vim.lsp.buf.declaration<cr>", opts)
-
-	opts.desc = "show LSP definition"
-	km("n", "<leader>ld", ":Telescope lsp_definitions<cr>", opts)
-
-	opts.desc = "Show LSP implementations"
-	km("n", "<leader>li", ":Telescope lsp_implementations<cr>", opts)
-
-	opts.desc = "Show LSP type definitions"
-	km("n", "<leader>lt", ":Telescope lsp_type_definitions<cr>", opts)
-
-	opts.desc = "See available code actions"
-	km({ "n", "v" }, "<leader>lc", vim.lsp.buf.code_action, opts)
-
-	opts.desc = "Smart rename"
-	km("n", "<leader>ln", vim.lsp.buf.rename, opts)
-
-	opts.desc = "Show buffer diagnostics"
-	km("n", "<leader>lE", ":Telescope diagnostics bufnr=0<cr>", opts)
-
-	opts.desc = "Show line diagnostics"
-	km("n", "<leader>le", vim.diagnostic.open_float, opts)
-
-	opts.desc = "Go to previous diagnostic"
-	km("n", "<leader>lp", vim.diagnostic.goto_prev, opts)
-
-	opts.desc = "Go to next diagnostic"
-	km("n", "<leader>ln", vim.diagnostic.goto_next, opts)
-
-	opts.desc = "Restart LSP"
-	km("n", "<leader>ls", ":LspRestart<cr>", opts)
-end
diff --git a/lua/config/lsp/bash.lua b/lua/config/lsp/bash.lua
index bbdcc76..286c86c 100644
--- a/lua/config/lsp/bash.lua
+++ b/lua/config/lsp/bash.lua
@@ -15,8 +15,8 @@ mason_lspconfig.setup({
 })
 
 lspconfig.bashls.setup({
-	capabilities = require("config/lsp/capabilities"),
-	on_attach = require("config/lsp/attach"),
+	capabilities = require("config/lsp/lsp-capabilities"),
+	on_attach = require("config/lsp/lsp-attach"),
 })
 
 mason_tool_installer.setup({
diff --git a/lua/config/lsp/capabilities.lua b/lua/config/lsp/capabilities.lua
deleted file mode 100644
index d993313..0000000
--- a/lua/config/lsp/capabilities.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-local ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
-if not ok then
-  return
-end
-
-return cmp_nvim_lsp.default_capabilities()
diff --git a/lua/config/lsp/lua.lua b/lua/config/lsp/lua.lua
index 46ba35b..a92c711 100644
--- a/lua/config/lsp/lua.lua
+++ b/lua/config/lsp/lua.lua
@@ -20,8 +20,8 @@ mason_tool_installer.setup({
 
 lspconfig.lua_ls.setup({
 	-- capabilities = cmp_nvim_lsp.default_capabilities()
-	capabilities = require("config/lsp/capabilities"),
-	on_attach = require("config/lsp/attach"),
+	capabilities = require("config/lsp/lsp-capabilities"),
+	on_attach = require("config/lsp/lsp-attach"),
 	settings = { -- custom settings for lua
 		Lua = {
 			-- make the language server recognize "vim" global
diff --git a/lua/config/lsp/signs.lua b/lua/config/lsp/signs.lua
deleted file mode 100644
index 1ace494..0000000
--- a/lua/config/lsp/signs.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-local signs = { Error = " ", Warn = " ", Hint = "󰠠 ", Info = " " }
-
-for type, icon in pairs(signs) do
-  local hl = "DiagnosticSign" .. type
-  vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-end
diff --git a/lua/config/lsp/web.lua b/lua/config/lsp/web.lua
index 0f06f85..688fb72 100644
--- a/lua/config/lsp/web.lua
+++ b/lua/config/lsp/web.lua
@@ -20,23 +20,23 @@ mason_lspconfig.setup({
 })
 
 lspconfig.tsserver.setup({
-	capabilities = require("config/lsp/capabilities"),
-	on_attach = require("config/lsp/attach"),
+	capabilities = require("config/lsp/lsp-capabilities"),
+	on_attach = require("config/lsp/lsp-attach"),
 })
 
 lspconfig.html.setup({
-	capabilities = require("config/lsp/capabilities"),
-	on_attach = require("config/lsp/attach"),
+	capabilities = require("config/lsp/lsp-capabilities"),
+	on_attach = require("config/lsp/lsp-attach"),
 })
 
 lspconfig.emmet_ls.setup({
-	capabilities = require("config/lsp/capabilities"),
-	on_attach = require("config/lsp/attach"),
+	capabilities = require("config/lsp/lsp-capabilities"),
+	on_attach = require("config/lsp/lsp-attach"),
 })
 
 lspconfig.cssls.setup({
-	capabilities = require("config/lsp/capabilities"),
-	on_attach = require("config/lsp/attach"),
+	capabilities = require("config/lsp/lsp-capabilities"),
+	on_attach = require("config/lsp/lsp-attach"),
 })
 
 mason_tool_installer.setup({
diff --git a/lua/config/nvim-cmp.lua b/lua/config/nvim-cmp.lua
index a3741ce..cc8555c 100644
--- a/lua/config/nvim-cmp.lua
+++ b/lua/config/nvim-cmp.lua
@@ -28,8 +28,8 @@ local opts = {
 	sources = cmp.config.sources({
 		{ name = "nvim_lsp" },
 		{ name = "luasnip" }, -- snippets
-		{ name = "buffer" }, -- text within current buffer
 		{ name = "path" }, -- file system paths
+		{ name = "buffer" }, -- text within current buffer
 	}),
 	-- configure lspkind for vs-code like pictograms in completion menu
 	formatting = {