diff --git a/home/user/.config/nvim/lua/plugins/auto_save.lua b/home/user/.config/nvim/lua/plugins/auto_save.lua
deleted file mode 100644
index aa3dce6..0000000
--- a/home/user/.config/nvim/lua/plugins/auto_save.lua
+++ /dev/null
@@ -1,36 +0,0 @@
-return {
-    'Pocco81/auto-save.nvim',
-    config = function()
-        require("auto-save").setup({
-            enabled = true, -- start auto-save when the plugin is loaded (i.e. when your package manager loads it)
-            execution_message = {
-                message = function() -- message to print on save
-                    return ""
-                end,
-                dim = 0.18, -- dim the color of `message`
-                cleaning_interval = 1250, -- (milliseconds) automatically clean MsgArea after displaying `message`. See :h MsgArea
-            },
-            trigger_events = {"InsertLeave", "TextChanged"}, -- vim events that trigger auto-save. See :h events
-            condition = function(buf)
-                local fn = vim.fn
-                local utils = require("auto-save.utils.data")
-                if
-                  fn.getbufvar(buf, "&modifiable") == 1 and
-                  utils.not_in(fn.getbufvar(buf, "&filetype"), {})
-                then
-                        return true -- met condition(s), can save
-                end
-                return false -- can't save
-            end,
-            write_all_buffers = false, -- write all buffers when the current one meets `condition`
-            debounce_delay = 135, -- saves the file at most every `debounce_delay` milliseconds
-                callbacks = { -- functions to be executed at different intervals
-                    enabling = nil, -- ran when enabling auto-save
-                    disabling = nil, -- ran when disabling auto-save
-                    before_asserting_save = nil, -- ran before checking `condition`
-                    before_saving = nil, -- ran before doing the actual save
-                    after_saving = nil -- ran after doing the actual save
-                }
-        })
-    end
-}
\ No newline at end of file
diff --git a/home/user/.config/nvim/lua/plugins/nvim_cmp.lua b/home/user/.config/nvim/lua/plugins/autocomplete.lua
similarity index 98%
rename from home/user/.config/nvim/lua/plugins/nvim_cmp.lua
rename to home/user/.config/nvim/lua/plugins/autocomplete.lua
index 9445fc9..6f56baf 100644
--- a/home/user/.config/nvim/lua/plugins/nvim_cmp.lua
+++ b/home/user/.config/nvim/lua/plugins/autocomplete.lua
@@ -91,7 +91,7 @@ return {
             local map = vim.keymap.set
             map({'i', 's'}, '<C-n>', jump(1), {silent = true})
             map({'i', 's'}, '<C-p>', jump(-1), {silent = true})
-            map({'i', 's'}, '<C-k>', ls.expand(), {silent = true})
+            map({'i', 's'}, '<C-k>', ls.expand, {silent = true})
             map({"i", "s"}, "<C-e>",
                 function()
                     if ls.choice_active() then
diff --git a/home/user/.config/nvim/lua/plugins/better_escape.lua b/home/user/.config/nvim/lua/plugins/better_escape.lua
deleted file mode 100644
index 43f59cb..0000000
--- a/home/user/.config/nvim/lua/plugins/better_escape.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-    "max397574/better-escape.nvim",
-    config = function()
-        require("better_escape").setup({
-            mapping = {'jf', 'оа'},
-            timeout = vim.o.timeoutlen,
-            keys = '<ESC>`^'
-        })
-    end,
-}
\ No newline at end of file
diff --git a/home/user/.config/nvim/lua/plugins/leap.lua b/home/user/.config/nvim/lua/plugins/leap.lua
deleted file mode 100644
index 4816a90..0000000
--- a/home/user/.config/nvim/lua/plugins/leap.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-    'ggandor/leap.nvim',
-    keys = {
-        {"J", "<Plug>(leap-forward-to)"},
-        {"K", "<Plug>(leap-backward-to)"},
-    },
-    config = function()
-        require('leap').opts.safe_labels = {}
-    end,
-}
\ No newline at end of file
diff --git a/home/user/.config/nvim/lua/plugins/mason.lua b/home/user/.config/nvim/lua/plugins/lsp_manager.lua
similarity index 100%
rename from home/user/.config/nvim/lua/plugins/mason.lua
rename to home/user/.config/nvim/lua/plugins/lsp_manager.lua
diff --git a/home/user/.config/nvim/lua/plugins/marks.lua b/home/user/.config/nvim/lua/plugins/marks.lua
deleted file mode 100644
index 750253c..0000000
--- a/home/user/.config/nvim/lua/plugins/marks.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-    'chentoast/marks.nvim',
-    config = function()
-        require("marks").setup()
-    end
-}
diff --git a/home/user/.config/nvim/lua/plugins/misc.lua b/home/user/.config/nvim/lua/plugins/misc.lua
index ff1154a..81d03ce 100644
--- a/home/user/.config/nvim/lua/plugins/misc.lua
+++ b/home/user/.config/nvim/lua/plugins/misc.lua
@@ -83,4 +83,66 @@ return {
             end)
         end
     },
+    {
+        'ggandor/leap.nvim',
+        keys = {
+            {"J", "<Plug>(leap-forward-to)"},
+            {"K", "<Plug>(leap-backward-to)"},
+        },
+        config = function()
+            require('leap').opts.safe_labels = {}
+        end,
+    },
+    {
+        'chentoast/marks.nvim',
+        config = function()
+            require("marks").setup()
+        end
+    },
+    {
+        "max397574/better-escape.nvim",
+        config = function()
+            require("better_escape").setup({
+                mapping = {'jf', 'оа'},
+                timeout = vim.o.timeoutlen,
+                keys = '<ESC>`^'
+            })
+        end,
+    },
+    {
+        'Pocco81/auto-save.nvim',
+        config = function()
+            require("auto-save").setup({
+                enabled = true, -- start auto-save when the plugin is loaded (i.e. when your package manager loads it)
+                execution_message = {
+                    message = function() -- message to print on save
+                        return ""
+                    end,
+                    dim = 0.18, -- dim the color of `message`
+                    cleaning_interval = 1250, -- (milliseconds) automatically clean MsgArea after displaying `message`. See :h MsgArea
+                },
+                trigger_events = {"InsertLeave", "TextChanged"}, -- vim events that trigger auto-save. See :h events
+                condition = function(buf)
+                    local fn = vim.fn
+                    local utils = require("auto-save.utils.data")
+                    if
+                      fn.getbufvar(buf, "&modifiable") == 1 and
+                      utils.not_in(fn.getbufvar(buf, "&filetype"), {})
+                    then
+                            return true -- met condition(s), can save
+                    end
+                    return false -- can't save
+                end,
+                write_all_buffers = false, -- write all buffers when the current one meets `condition`
+                debounce_delay = 135, -- saves the file at most every `debounce_delay` milliseconds
+                    callbacks = { -- functions to be executed at different intervals
+                        enabling = nil, -- ran when enabling auto-save
+                        disabling = nil, -- ran when disabling auto-save
+                        before_asserting_save = nil, -- ran before checking `condition`
+                        before_saving = nil, -- ran before doing the actual save
+                        after_saving = nil -- ran after doing the actual save
+                    }
+            })
+        end
+    },
 }
\ No newline at end of file