diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index 5d69ed5..b242528 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -23,7 +23,7 @@ vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
   spec = {
-    { import = "config.plugins" },
+    { import = "plugins" },
   },
   performance = {
     rtp = {
diff --git a/lua/config/plugins/fold.lua b/lua/config/plugins/fold.lua
deleted file mode 100644
index 188859b..0000000
--- a/lua/config/plugins/fold.lua
+++ /dev/null
@@ -1,53 +0,0 @@
-return {
-  "bbjornstad/pretty-fold.nvim",
-  enabled = true,
-  config = function()
-    local global_setup = {
-      sections = {
-        left = { "content" },
-        right = {
-          " ",
-          function()
-            return ("[%dL]"):format(vim.v.foldend - vim.v.foldstart)
-          end,
-          "[",
-          "percentage",
-          "]",
-        },
-      },
-      matchup_patterns = {
-        { "{", "}" },
-        { "%(", ")" }, -- % to escape lua pattern char
-        { "%[", "]" }, -- % to escape lua pattern char
-      },
-      -- add_close_pattern = true,
-      process_comment_signs = ({ "delete", "spaces", false })[2],
-    }
-
-    local function ft_setup(lang, options) -- {{{
-      local opts = vim.tbl_deep_extend("force", global_setup, options)
-      -- combine global and ft specific matchup_patterns
-      if opts and opts.matchup_patterns and global_setup.matchup_patterns then
-        opts.matchup_patterns = vim.list_extend(opts.matchup_patterns, global_setup.matchup_patterns)
-      end
-      require("pretty-fold").ft_setup(lang, opts)
-    end -- }}}
-
-    require("pretty-fold").setup(global_setup)
-
-    ft_setup("lua", { -- {{{
-      matchup_patterns = {
-        { "^%s*do$", "end" }, -- do ... end blocks
-        { "^%s*if", "end" }, -- if ... end
-        { "^%s*for", "end" }, -- for
-        { "function[^%(]*%(", "end" }, -- 'function( or 'function (''
-      },
-    }) -- }}}
-
-    ft_setup("vim", { -- {{{
-      matchup_patterns = {
-        { "^%s*function!?[^%(]*%(", "endfunction" },
-      },
-    }) -- }}}
-  end,
-}
diff --git a/lua/config/plugins/ui/init.lua b/lua/config/plugins/ui/init.lua
deleted file mode 100644
index 42837c2..0000000
--- a/lua/config/plugins/ui/init.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-local M = {
-  require("config.plugins.ui.colors"),
-  require("config.plugins.ui.alpha"),
-  require("config.plugins.ui.dressing"),
-  require("config.plugins.ui.whichkey"),
-  require("config.plugins.ui.noice"),
-  require("config.plugins.ui.scroll"),
-  require("config.plugins.ui.status"),
-}
-
-return M
diff --git a/lua/config/plugins/ai.lua b/lua/plugins/ai.lua
similarity index 100%
rename from lua/config/plugins/ai.lua
rename to lua/plugins/ai.lua
diff --git a/lua/config/plugins/blankline.lua b/lua/plugins/blankline.lua
similarity index 100%
rename from lua/config/plugins/blankline.lua
rename to lua/plugins/blankline.lua
diff --git a/lua/config/plugins/chezmoi.lua b/lua/plugins/chezmoi.lua
similarity index 100%
rename from lua/config/plugins/chezmoi.lua
rename to lua/plugins/chezmoi.lua
diff --git a/lua/config/plugins/colorizer.lua b/lua/plugins/colorizer.lua
similarity index 100%
rename from lua/config/plugins/colorizer.lua
rename to lua/plugins/colorizer.lua
diff --git a/lua/config/plugins/comments.lua b/lua/plugins/comments.lua
similarity index 100%
rename from lua/config/plugins/comments.lua
rename to lua/plugins/comments.lua
diff --git a/lua/config/plugins/completion.lua b/lua/plugins/completion.lua
similarity index 100%
rename from lua/config/plugins/completion.lua
rename to lua/plugins/completion.lua
diff --git a/lua/config/plugins/db.lua b/lua/plugins/db.lua
similarity index 100%
rename from lua/config/plugins/db.lua
rename to lua/plugins/db.lua
diff --git a/lua/config/plugins/diagnostics.lua b/lua/plugins/diagnostics.lua
similarity index 100%
rename from lua/config/plugins/diagnostics.lua
rename to lua/plugins/diagnostics.lua
diff --git a/lua/config/plugins/env.lua b/lua/plugins/env.lua
similarity index 100%
rename from lua/config/plugins/env.lua
rename to lua/plugins/env.lua
diff --git a/lua/config/plugins/flash.lua b/lua/plugins/flash.lua
similarity index 100%
rename from lua/config/plugins/flash.lua
rename to lua/plugins/flash.lua
diff --git a/lua/plugins/fold.lua b/lua/plugins/fold.lua
new file mode 100644
index 0000000..6d0f8b8
--- /dev/null
+++ b/lua/plugins/fold.lua
@@ -0,0 +1,53 @@
+local M = {
+  "bbjornstad/pretty-fold.nvim",
+}
+
+M.config = function()
+  local global_setup = {
+    sections = {
+      left = { "content" },
+      right = {
+        " ",
+        function()
+          return ("[%dL]"):format(vim.v.foldend - vim.v.foldstart)
+        end,
+        "[",
+        "percentage",
+        "]",
+      },
+    },
+    matchup_patterns = {
+      { "{", "}" },
+      { "%(", ")" },
+      { "%[", "]" },
+    },
+    process_comment_signs = ({ "delete", "spaces", false })[2],
+  }
+
+  local function ft_setup(lang, options) -- {{{
+    local opts = vim.tbl_deep_extend("force", global_setup, options)
+    if opts and opts.matchup_patterns and global_setup.matchup_patterns then
+      opts.matchup_patterns = vim.list_extend(opts.matchup_patterns, global_setup.matchup_patterns)
+    end
+    require("pretty-fold").ft_setup(lang, opts)
+  end -- }}}
+
+  require("pretty-fold").setup(global_setup)
+
+  ft_setup("lua", {
+    matchup_patterns = {
+      { "^%s*do$", "end" },
+      { "^%s*if", "end" },
+      { "^%s*for", "end" },
+      { "function[^%(]*%(", "end" },
+    },
+  })
+
+  ft_setup("vim", {
+    matchup_patterns = {
+      { "^%s*function!?[^%(]*%(", "endfunction" },
+    },
+  })
+end
+
+return M
diff --git a/lua/config/plugins/format.lua b/lua/plugins/format.lua
similarity index 100%
rename from lua/config/plugins/format.lua
rename to lua/plugins/format.lua
diff --git a/lua/config/plugins/fzf.lua b/lua/plugins/fzf.lua
similarity index 100%
rename from lua/config/plugins/fzf.lua
rename to lua/plugins/fzf.lua
diff --git a/lua/config/plugins/git.lua b/lua/plugins/git.lua
similarity index 100%
rename from lua/config/plugins/git.lua
rename to lua/plugins/git.lua
diff --git a/lua/config/plugins/harpoon.lua b/lua/plugins/harpoon.lua
similarity index 100%
rename from lua/config/plugins/harpoon.lua
rename to lua/plugins/harpoon.lua
diff --git a/lua/config/plugins/lastplace.lua b/lua/plugins/lastplace.lua
similarity index 100%
rename from lua/config/plugins/lastplace.lua
rename to lua/plugins/lastplace.lua
diff --git a/lua/config/plugins/lint.lua b/lua/plugins/lint.lua
similarity index 100%
rename from lua/config/plugins/lint.lua
rename to lua/plugins/lint.lua
diff --git a/lua/config/plugins/lsp/extras/gopher.lua b/lua/plugins/lsp/extras/gopher.lua
similarity index 100%
rename from lua/config/plugins/lsp/extras/gopher.lua
rename to lua/plugins/lsp/extras/gopher.lua
diff --git a/lua/config/plugins/lsp/extras/lazydev.lua b/lua/plugins/lsp/extras/lazydev.lua
similarity index 100%
rename from lua/config/plugins/lsp/extras/lazydev.lua
rename to lua/plugins/lsp/extras/lazydev.lua
diff --git a/lua/config/plugins/lsp/extras/typescript.lua b/lua/plugins/lsp/extras/typescript.lua
similarity index 100%
rename from lua/config/plugins/lsp/extras/typescript.lua
rename to lua/plugins/lsp/extras/typescript.lua
diff --git a/lua/config/plugins/lsp/init.lua b/lua/plugins/lsp/init.lua
similarity index 93%
rename from lua/config/plugins/lsp/init.lua
rename to lua/plugins/lsp/init.lua
index bc3cfd3..6d568cf 100644
--- a/lua/config/plugins/lsp/init.lua
+++ b/lua/plugins/lsp/init.lua
@@ -4,9 +4,9 @@ local M = {
     "saghen/blink.cmp",
     "williamboman/mason.nvim",
     "williamboman/mason-lspconfig.nvim",
-    require("config.plugins.lsp.extras.lazydev"),
-    require("config.plugins.lsp.extras.gopher"),
-    require("config.plugins.lsp.extras.typescript"),
+    require("plugins.lsp.extras.lazydev"),
+    require("plugins.lsp.extras.gopher"),
+    require("plugins.lsp.extras.typescript"),
   },
 }
 
@@ -124,7 +124,7 @@ function M.config()
         }
 
         -- Try to load server-specific configuration
-        local ok, server_opts = pcall(require, "config.plugins.lsp.servers." .. server_name)
+        local ok, server_opts = pcall(require, "plugins.lsp.servers." .. server_name)
         if ok then
           base_opts = vim.tbl_deep_extend("force", base_opts, server_opts)
         end
diff --git a/lua/config/plugins/lsp/servers/gopls.lua b/lua/plugins/lsp/servers/gopls.lua
similarity index 100%
rename from lua/config/plugins/lsp/servers/gopls.lua
rename to lua/plugins/lsp/servers/gopls.lua
diff --git a/lua/config/plugins/lsp/servers/html.lua b/lua/plugins/lsp/servers/html.lua
similarity index 100%
rename from lua/config/plugins/lsp/servers/html.lua
rename to lua/plugins/lsp/servers/html.lua
diff --git a/lua/config/plugins/lsp/servers/htmx.lua b/lua/plugins/lsp/servers/htmx.lua
similarity index 100%
rename from lua/config/plugins/lsp/servers/htmx.lua
rename to lua/plugins/lsp/servers/htmx.lua
diff --git a/lua/config/plugins/lsp/servers/jsonls.lua b/lua/plugins/lsp/servers/jsonls.lua
similarity index 100%
rename from lua/config/plugins/lsp/servers/jsonls.lua
rename to lua/plugins/lsp/servers/jsonls.lua
diff --git a/lua/config/plugins/lsp/servers/lua_ls.lua b/lua/plugins/lsp/servers/lua_ls.lua
similarity index 100%
rename from lua/config/plugins/lsp/servers/lua_ls.lua
rename to lua/plugins/lsp/servers/lua_ls.lua
diff --git a/lua/config/plugins/lsp/servers/omnisharp.lua b/lua/plugins/lsp/servers/omnisharp.lua
similarity index 100%
rename from lua/config/plugins/lsp/servers/omnisharp.lua
rename to lua/plugins/lsp/servers/omnisharp.lua
diff --git a/lua/config/plugins/lsp/servers/yamlls.lua b/lua/plugins/lsp/servers/yamlls.lua
similarity index 100%
rename from lua/config/plugins/lsp/servers/yamlls.lua
rename to lua/plugins/lsp/servers/yamlls.lua
diff --git a/lua/config/plugins/markdown.lua b/lua/plugins/markdown.lua
similarity index 100%
rename from lua/config/plugins/markdown.lua
rename to lua/plugins/markdown.lua
diff --git a/lua/config/plugins/mini.lua b/lua/plugins/mini.lua
similarity index 100%
rename from lua/config/plugins/mini.lua
rename to lua/plugins/mini.lua
diff --git a/lua/config/plugins/navic.lua b/lua/plugins/navic.lua
similarity index 100%
rename from lua/config/plugins/navic.lua
rename to lua/plugins/navic.lua
diff --git a/lua/config/plugins/oil.lua b/lua/plugins/oil.lua
similarity index 100%
rename from lua/config/plugins/oil.lua
rename to lua/plugins/oil.lua
diff --git a/lua/config/plugins/schema.lua b/lua/plugins/schema.lua
similarity index 100%
rename from lua/config/plugins/schema.lua
rename to lua/plugins/schema.lua
diff --git a/lua/config/plugins/snips.lua b/lua/plugins/snips.lua
similarity index 100%
rename from lua/config/plugins/snips.lua
rename to lua/plugins/snips.lua
diff --git a/lua/config/plugins/spectre.lua b/lua/plugins/spectre.lua
similarity index 100%
rename from lua/config/plugins/spectre.lua
rename to lua/plugins/spectre.lua
diff --git a/lua/config/plugins/sudo.lua b/lua/plugins/sudo.lua
similarity index 100%
rename from lua/config/plugins/sudo.lua
rename to lua/plugins/sudo.lua
diff --git a/lua/config/plugins/tpope.lua b/lua/plugins/tpope.lua
similarity index 100%
rename from lua/config/plugins/tpope.lua
rename to lua/plugins/tpope.lua
diff --git a/lua/config/plugins/treesitter.lua b/lua/plugins/treesitter.lua
similarity index 100%
rename from lua/config/plugins/treesitter.lua
rename to lua/plugins/treesitter.lua
diff --git a/lua/config/plugins/ui/alpha.lua b/lua/plugins/ui/alpha.lua
similarity index 100%
rename from lua/config/plugins/ui/alpha.lua
rename to lua/plugins/ui/alpha.lua
diff --git a/lua/config/plugins/ui/colors.lua b/lua/plugins/ui/colors.lua
similarity index 100%
rename from lua/config/plugins/ui/colors.lua
rename to lua/plugins/ui/colors.lua
diff --git a/lua/config/plugins/ui/dressing.lua b/lua/plugins/ui/dressing.lua
similarity index 100%
rename from lua/config/plugins/ui/dressing.lua
rename to lua/plugins/ui/dressing.lua
diff --git a/lua/plugins/ui/init.lua b/lua/plugins/ui/init.lua
new file mode 100644
index 0000000..ca1f816
--- /dev/null
+++ b/lua/plugins/ui/init.lua
@@ -0,0 +1,11 @@
+local M = {
+  require("plugins.ui.colors"),
+  require("plugins.ui.alpha"),
+  require("plugins.ui.dressing"),
+  require("plugins.ui.whichkey"),
+  require("plugins.ui.noice"),
+  require("plugins.ui.scroll"),
+  require("plugins.ui.status"),
+}
+
+return M
diff --git a/lua/config/plugins/ui/noice.lua b/lua/plugins/ui/noice.lua
similarity index 100%
rename from lua/config/plugins/ui/noice.lua
rename to lua/plugins/ui/noice.lua
diff --git a/lua/config/plugins/ui/scroll.lua b/lua/plugins/ui/scroll.lua
similarity index 100%
rename from lua/config/plugins/ui/scroll.lua
rename to lua/plugins/ui/scroll.lua
diff --git a/lua/config/plugins/ui/status.lua b/lua/plugins/ui/status.lua
similarity index 100%
rename from lua/config/plugins/ui/status.lua
rename to lua/plugins/ui/status.lua
diff --git a/lua/config/plugins/ui/whichkey.lua b/lua/plugins/ui/whichkey.lua
similarity index 100%
rename from lua/config/plugins/ui/whichkey.lua
rename to lua/plugins/ui/whichkey.lua
diff --git a/lua/config/plugins/undo.lua b/lua/plugins/undo.lua
similarity index 100%
rename from lua/config/plugins/undo.lua
rename to lua/plugins/undo.lua