diff --git a/home/user/.config/nvim/init.lua b/home/user/.config/nvim/init.lua
index d3c1589..fa15c71 100644
--- a/home/user/.config/nvim/init.lua
+++ b/home/user/.config/nvim/init.lua
@@ -1 +1 @@
-require("base")
+require("core")
\ No newline at end of file
diff --git a/home/user/.config/nvim/lua/base/mappings/init.lua b/home/user/.config/nvim/lua/base/mappings/init.lua
deleted file mode 100644
index 181d4c7..0000000
--- a/home/user/.config/nvim/lua/base/mappings/init.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-require("base.mappings.mappings")
-require("base.mappings.run-scripts")
diff --git a/home/user/.config/nvim/lua/base/init.lua b/home/user/.config/nvim/lua/core/init.lua
similarity index 77%
rename from home/user/.config/nvim/lua/base/init.lua
rename to home/user/.config/nvim/lua/core/init.lua
index 421bb1a..8af1acc 100644
--- a/home/user/.config/nvim/lua/base/init.lua
+++ b/home/user/.config/nvim/lua/core/init.lua
@@ -1,7 +1,7 @@
 for _, source in ipairs({
-    "base.options",
-    "base.mappings",
-    "base.lazy",
+    "core.options",
+    "core.mappings",
+    "core.lazy",
 })
 do
     local status_ok, fault = pcall(require, source)
diff --git a/home/user/.config/nvim/lua/base/lazy.lua b/home/user/.config/nvim/lua/core/lazy.lua
similarity index 64%
rename from home/user/.config/nvim/lua/base/lazy.lua
rename to home/user/.config/nvim/lua/core/lazy.lua
index 8046827..76e2ca9 100644
--- a/home/user/.config/nvim/lua/base/lazy.lua
+++ b/home/user/.config/nvim/lua/core/lazy.lua
@@ -18,5 +18,14 @@ vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup(
     "plugins",
-    { lockfile = vim.fn.stdpath("data") .. "/lazy-lock.json" }
+    {
+        change_detection = { enabled = false },
+        lockfile = vim.fn.stdpath("data") .. "/lazy-lock.json",
+        ui = { border = "rounded" },
+        performance = {
+            cache = {
+                enabled = true,
+            }
+        }
+    }
 )
\ No newline at end of file
diff --git a/home/user/.config/nvim/lua/core/mappings/init.lua b/home/user/.config/nvim/lua/core/mappings/init.lua
new file mode 100644
index 0000000..ddb57bb
--- /dev/null
+++ b/home/user/.config/nvim/lua/core/mappings/init.lua
@@ -0,0 +1,2 @@
+require("core.mappings.mappings")
+require("core.mappings.run-scripts")
\ No newline at end of file
diff --git a/home/user/.config/nvim/lua/base/mappings/mappings.lua b/home/user/.config/nvim/lua/core/mappings/mappings.lua
similarity index 100%
rename from home/user/.config/nvim/lua/base/mappings/mappings.lua
rename to home/user/.config/nvim/lua/core/mappings/mappings.lua
diff --git a/home/user/.config/nvim/lua/base/mappings/run-scripts.lua b/home/user/.config/nvim/lua/core/mappings/run-scripts.lua
similarity index 100%
rename from home/user/.config/nvim/lua/base/mappings/run-scripts.lua
rename to home/user/.config/nvim/lua/core/mappings/run-scripts.lua
diff --git a/home/user/.config/nvim/lua/base/options.lua b/home/user/.config/nvim/lua/core/options.lua
similarity index 100%
rename from home/user/.config/nvim/lua/base/options.lua
rename to home/user/.config/nvim/lua/core/options.lua
diff --git a/home/user/.config/nvim/lua/plugins/gitsigns.lua b/home/user/.config/nvim/lua/plugins/gitsigns.lua
index 4989827..04bd568 100644
--- a/home/user/.config/nvim/lua/plugins/gitsigns.lua
+++ b/home/user/.config/nvim/lua/plugins/gitsigns.lua
@@ -1,5 +1,6 @@
 return {
     'lewis6991/gitsigns.nvim',
+    event = "BufReadPost",
     enabled = vim.fn.executable "git" == 1,
     config = function()
         require("gitsigns").setup({
@@ -13,4 +14,4 @@ return {
             }
         })
     end
-}
+}
\ No newline at end of file
diff --git a/home/user/.config/nvim/lua/plugins/lualine.lua b/home/user/.config/nvim/lua/plugins/lualine.lua
index 7128fe0..64b4406 100644
--- a/home/user/.config/nvim/lua/plugins/lualine.lua
+++ b/home/user/.config/nvim/lua/plugins/lualine.lua
@@ -24,6 +24,7 @@ end
 
 return {
     'nvim-lualine/lualine.nvim',
+    event = "VeryLazy",
     config = function()
         require("lualine").setup({
             options = {
diff --git a/home/user/.config/nvim/lua/plugins/misc.lua b/home/user/.config/nvim/lua/plugins/misc.lua
index 0e3b52f..26122a9 100644
--- a/home/user/.config/nvim/lua/plugins/misc.lua
+++ b/home/user/.config/nvim/lua/plugins/misc.lua
@@ -15,7 +15,6 @@ return {
     },
     {
         "kylechui/nvim-surround",
-        version = "*",
         event = "VeryLazy",
         config = function()
             require("nvim-surround").setup()
@@ -29,6 +28,7 @@ return {
     },
     {
         'numToStr/Comment.nvim',
+        keys = { { "gc" }, { "gc", mode = "v" } },
         config = function()
             require("Comment").setup()
         end
@@ -42,6 +42,7 @@ return {
     {
         'nvim-treesitter/nvim-treesitter',
         build = ':TSUpdate',
+        event = "BufReadPost",
         config = function()
             require("nvim-treesitter.configs").setup({
                 ensure_installed = {"python", "lua", "vim", "html", "rust", "markdown"},
diff --git a/home/user/.config/nvim/lua/plugins/nvim_cmp.lua b/home/user/.config/nvim/lua/plugins/nvim_cmp.lua
index 7e79502..4d77951 100644
--- a/home/user/.config/nvim/lua/plugins/nvim_cmp.lua
+++ b/home/user/.config/nvim/lua/plugins/nvim_cmp.lua
@@ -65,6 +65,7 @@ end
 return {
     {
         'L3MON4D3/LuaSnip',
+        event = "InsertEnter",
         build = "make install_jsregexp",
         dependencies = {
             'hrsh7th/nvim-cmp',
@@ -95,6 +96,7 @@ return {
     },
     {
         'hrsh7th/nvim-cmp',
+        event = "InsertEnter",
         dependencies = {
             "hrsh7th/cmp-buffer",
             "hrsh7th/cmp-path",
@@ -108,5 +110,6 @@ return {
     },
     {
         'neovim/nvim-lspconfig',
+        event = "InsertEnter",
     },
 }
\ No newline at end of file
diff --git a/home/user/.config/nvim/lua/plugins/vim_textobj.lua b/home/user/.config/nvim/lua/plugins/vim_textobj.lua
index 8db12c0..13fac9d 100644
--- a/home/user/.config/nvim/lua/plugins/vim_textobj.lua
+++ b/home/user/.config/nvim/lua/plugins/vim_textobj.lua
@@ -1,10 +1,12 @@
 return {
     {
         'kana/vim-textobj-lastpat', -- text-object i/, operate under finding
+        event = "InsertEnter",
         dependencies = { 'kana/vim-textobj-user' }
     },
     {
         'sgur/vim-textobj-parameter',
+        event = "InsertEnter",
         dependencies = { 'kana/vim-textobj-user' }
     }
 }
\ No newline at end of file