diff --git a/README.md b/README.md
index 2d07c9cd..73dc7f43 100644
--- a/README.md
+++ b/README.md
@@ -16,29 +16,29 @@ A starter template for Neovim using [lazy.nvim](https://github.com/folke/lazy.nv
 ## File Structure
 
 <pre>
- ~/.config/nvim
-├──  lua
-│  └──  user
-│     ├──  plugins
-│     │  ├──  lsp
-│     │  │  ├──  format.lua
-│     │  │  ├──  init.lua
-│     │  │  ├──  keymaps.lua
-│     │  │  └──  servers.lua
-│     │  ├──  api.lua
-│     │  ├──  coding.lua
-│     │  ├──  colorscheme.lua
-│     │  ├──  editor.lua
-│     │  ├──  treesitter.lua
-│     │  └──  ui.lua
-│     ├──  autocmds.lua
-│     ├──  keymaps.lua
-│     ├──  lazy.lua
-│     └──  options.lua
-├──  init.lua
-├──  lazy-lock.json
-├──  README.md
-└──  stylua.toml
+~/.config/nvim
+├── lua
+│   ├── config
+│   │   ├── autocmds.lua
+│   │   ├── keymaps.lua
+│   │   ├── lazy.lua
+│   │   └── options.lua
+│   └── plugins
+│       ├── lsp
+│       │   ├── format.lua
+│       │   ├── init.lua
+│       │   ├── keymaps.lua
+│       │   └── servers.lua
+│       ├── api.lua
+│       ├── coding.lua
+│       ├── colorscheme.lua
+│       ├── editor.lua
+│       ├── treesitter.lua
+│       └── ui.lua
+├── init.lua
+├── lazy-lock.json
+├── README.md
+└── stylua.toml
 </pre>
 
 ## Plugins
diff --git a/init.lua b/init.lua
index db0dbefc..9180a7da 100644
--- a/init.lua
+++ b/init.lua
@@ -1,4 +1,4 @@
-require("user.options")
-require("user.lazy")
-require("user.autocmds")
-require("user.keymaps")
+require("config.options")
+require("config.lazy")
+require("config.autocmds")
+require("config.keymaps")
diff --git a/lazy-lock.json b/lazy-lock.json
index a30452fa..995344d0 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -10,7 +10,7 @@
   "friendly-snippets": { "branch": "main", "commit": "1a6a02350568d6830bcfa167c72f9b6e75e454ae" },
   "gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" },
   "indent-blankline.nvim": { "branch": "master", "commit": "db7cbcb40cc00fc5d6074d7569fb37197705e7f6" },
-  "lazy.nvim": { "branch": "main", "commit": "fb46cb586242392081f908b23470e5096a8406c3" },
+  "lazy.nvim": { "branch": "main", "commit": "cba99de3eb73437754984fcad02b3a0e05917e56" },
   "lualine.nvim": { "branch": "master", "commit": "32a7382a75a52e8ad05f4cec7eeb8bbfbe80d461" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "aa25b4153d2f2636c3b3a8c8360349d2b29e7ae3" },
   "mason.nvim": { "branch": "main", "commit": "1592493e3406c271e9128b4d424731e25f1ff2a1" },
diff --git a/lua/user/autocmds.lua b/lua/config/autocmds.lua
similarity index 100%
rename from lua/user/autocmds.lua
rename to lua/config/autocmds.lua
diff --git a/lua/user/keymaps.lua b/lua/config/keymaps.lua
similarity index 100%
rename from lua/user/keymaps.lua
rename to lua/config/keymaps.lua
diff --git a/lua/user/lazy.lua b/lua/config/lazy.lua
similarity index 69%
rename from lua/user/lazy.lua
rename to lua/config/lazy.lua
index f4b9f550..f583b01f 100644
--- a/lua/user/lazy.lua
+++ b/lua/config/lazy.lua
@@ -1,11 +1,17 @@
 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", lazypath })
-  vim.fn.system({ "git", "-C", lazypath, "checkout", "tags/stable" }) -- last stable release
+  vim.fn.system({
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable",
+    lazypath,
+  })
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("lazy").setup("user.plugins", {
+require("lazy").setup("plugins", {
   defaults = { lazy = true, version = "*" },
   install = { colorscheme = { "tokyonight", "habamax" } },
   checker = { enabled = true },
diff --git a/lua/user/options.lua b/lua/config/options.lua
similarity index 100%
rename from lua/user/options.lua
rename to lua/config/options.lua
diff --git a/lua/user/plugins/api.lua b/lua/plugins/api.lua
similarity index 100%
rename from lua/user/plugins/api.lua
rename to lua/plugins/api.lua
diff --git a/lua/user/plugins/coding.lua b/lua/plugins/coding.lua
similarity index 100%
rename from lua/user/plugins/coding.lua
rename to lua/plugins/coding.lua
diff --git a/lua/user/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
similarity index 100%
rename from lua/user/plugins/colorscheme.lua
rename to lua/plugins/colorscheme.lua
diff --git a/lua/user/plugins/editor.lua b/lua/plugins/editor.lua
similarity index 100%
rename from lua/user/plugins/editor.lua
rename to lua/plugins/editor.lua
diff --git a/lua/user/plugins/lsp/format.lua b/lua/plugins/lsp/format.lua
similarity index 100%
rename from lua/user/plugins/lsp/format.lua
rename to lua/plugins/lsp/format.lua
diff --git a/lua/user/plugins/lsp/init.lua b/lua/plugins/lsp/init.lua
similarity index 86%
rename from lua/user/plugins/lsp/init.lua
rename to lua/plugins/lsp/init.lua
index e11d934e..c8a05ac5 100644
--- a/lua/user/plugins/lsp/init.lua
+++ b/lua/plugins/lsp/init.lua
@@ -1,8 +1,8 @@
-local servers = require("user.plugins.lsp.servers")
+local servers = require("plugins.lsp.servers")
 
 local function on_attach(client, bufnr)
-  require("user.plugins.lsp.format").on_attach(client, bufnr)
-  require("user.plugins.lsp.keymaps").on_attach(client, bufnr)
+  require("plugins.lsp.format").on_attach(client, bufnr)
+  require("plugins.lsp.keymaps").on_attach(client, bufnr)
 end
 
 return {
diff --git a/lua/user/plugins/lsp/keymaps.lua b/lua/plugins/lsp/keymaps.lua
similarity index 95%
rename from lua/user/plugins/lsp/keymaps.lua
rename to lua/plugins/lsp/keymaps.lua
index 455c9e15..5645c705 100644
--- a/lua/user/plugins/lsp/keymaps.lua
+++ b/lua/plugins/lsp/keymaps.lua
@@ -20,12 +20,12 @@ function M.on_attach(client, buffer)
         },
         f = {
           {
-            require("user.plugins.lsp.format").format,
+            require("plugins.lsp.format").format,
             "Format Document",
             cond = cap.documentFormatting,
           },
           {
-            require("user.plugins.lsp.format").format,
+            require("plugins.lsp.format").format,
             "Format Range",
             cond = cap.documentRangeFormatting,
             mode = "v",
diff --git a/lua/user/plugins/lsp/servers.lua b/lua/plugins/lsp/servers.lua
similarity index 100%
rename from lua/user/plugins/lsp/servers.lua
rename to lua/plugins/lsp/servers.lua
diff --git a/lua/user/plugins/treesitter.lua b/lua/plugins/treesitter.lua
similarity index 100%
rename from lua/user/plugins/treesitter.lua
rename to lua/plugins/treesitter.lua
diff --git a/lua/user/plugins/ui.lua b/lua/plugins/ui.lua
similarity index 98%
rename from lua/user/plugins/ui.lua
rename to lua/plugins/ui.lua
index 993f3362..d83f86d9 100644
--- a/lua/user/plugins/ui.lua
+++ b/lua/plugins/ui.lua
@@ -31,6 +31,7 @@ return {
     config = {
       options = {
         globalstatus = true,
+        disabled_filetypes = { statusline = { "lazy", "alpha" } },
       },
     },
   },