30 files changed, 36 insertions, 37 deletions
diff --git a/lua/lvim/core/autocmds.lua b/lua/lvim/core/autocmds.lua
index a9f7115a..44a1e970 100644
--- a/lua/lvim/core/autocmds.lua
+++ b/lua/lvim/core/autocmds.lua
@@ -103,7 +103,7 @@ function M.load_defaults()
         group = "_lvim_colorscheme",
         callback = function()
           if lvim.builtin.breadcrumbs.active then
-            require("lvim.core.breadcrumbs").get_winbar()
+            require("lvim.core.builtins.breadcrumbs").get_winbar()
           end
           local statusline_hl = vim.api.nvim_get_hl_by_name("StatusLine", true)
           local cursorline_hl = vim.api.nvim_get_hl_by_name("CursorLine", true)
diff --git a/lua/lvim/core/alpha.lua b/lua/lvim/core/builtins/alpha.lua
index 4e14b39a..3270d01b 100644
--- a/lua/lvim/core/alpha.lua
+++ b/lua/lvim/core/builtins/alpha.lua
@@ -1,8 +1,8 @@
 local M = {}
 
 function M.config()
-  local lvim_dashboard = require "lvim.core.alpha.dashboard"
-  local lvim_startify = require "lvim.core.alpha.startify"
+  local lvim_dashboard = require "lvim.core.builtins.alpha.dashboard"
+  local lvim_startify = require "lvim.core.builtins.alpha.startify"
   lvim.builtin.alpha = {
     dashboard = {
       config = {},
diff --git a/lua/lvim/core/alpha/dashboard.lua b/lua/lvim/core/builtins/alpha/dashboard.lua
index 6a368924..6a368924 100644
--- a/lua/lvim/core/alpha/dashboard.lua
+++ b/lua/lvim/core/builtins/alpha/dashboard.lua
diff --git a/lua/lvim/core/alpha/startify.lua b/lua/lvim/core/builtins/alpha/startify.lua
index e9d10a07..e9d10a07 100644
--- a/lua/lvim/core/alpha/startify.lua
+++ b/lua/lvim/core/builtins/alpha/startify.lua
diff --git a/lua/lvim/core/autopairs.lua b/lua/lvim/core/builtins/autopairs.lua
index 97f405be..97f405be 100644
--- a/lua/lvim/core/autopairs.lua
+++ b/lua/lvim/core/builtins/autopairs.lua
diff --git a/lua/lvim/core/breadcrumbs.lua b/lua/lvim/core/builtins/breadcrumbs.lua
index 2196252a..2ed0937e 100644
--- a/lua/lvim/core/breadcrumbs.lua
+++ b/lua/lvim/core/builtins/breadcrumbs.lua
@@ -222,7 +222,7 @@ M.create_winbar = function()
           local status_ok, _ = pcall(vim.api.nvim_buf_get_var, 0, "lsp_floating_window")
           if not status_ok then
             -- TODO:
-            require("lvim.core.breadcrumbs").get_winbar()
+            M.get_winbar()
           end
         end
       end,
diff --git a/lua/lvim/core/bufferline.lua b/lua/lvim/core/builtins/bufferline.lua
index 768ed988..768ed988 100644
--- a/lua/lvim/core/bufferline.lua
+++ b/lua/lvim/core/builtins/bufferline.lua
diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/builtins/cmp.lua
index 2bbb7ecc..2bbb7ecc 100644
--- a/lua/lvim/core/cmp.lua
+++ b/lua/lvim/core/builtins/cmp.lua
diff --git a/lua/lvim/core/comment.lua b/lua/lvim/core/builtins/comment.lua
index 677dfbb6..677dfbb6 100644
--- a/lua/lvim/core/comment.lua
+++ b/lua/lvim/core/builtins/comment.lua
diff --git a/lua/lvim/core/dap.lua b/lua/lvim/core/builtins/dap.lua
index bc5b8e9d..bc5b8e9d 100644
--- a/lua/lvim/core/dap.lua
+++ b/lua/lvim/core/builtins/dap.lua
diff --git a/lua/lvim/core/gitsigns.lua b/lua/lvim/core/builtins/gitsigns.lua
index 27f50562..27f50562 100644
--- a/lua/lvim/core/gitsigns.lua
+++ b/lua/lvim/core/builtins/gitsigns.lua
diff --git a/lua/lvim/core/illuminate.lua b/lua/lvim/core/builtins/illuminate.lua
index 75afa362..75afa362 100644
--- a/lua/lvim/core/illuminate.lua
+++ b/lua/lvim/core/builtins/illuminate.lua
diff --git a/lua/lvim/core/indentlines.lua b/lua/lvim/core/builtins/indentlines.lua
index 43f025c6..43f025c6 100644
--- a/lua/lvim/core/indentlines.lua
+++ b/lua/lvim/core/builtins/indentlines.lua
diff --git a/lua/lvim/core/builtins/init.lua b/lua/lvim/core/builtins/init.lua
index 51b47b36..cd2946ab 100644
--- a/lua/lvim/core/builtins/init.lua
+++ b/lua/lvim/core/builtins/init.lua
@@ -1,26 +1,25 @@
 local M = {}
 
 local builtins = {
-  "lvim.core.theme",
-  "lvim.core.which-key",
-  "lvim.core.gitsigns",
-  "lvim.core.cmp",
-  "lvim.core.dap",
-  "lvim.core.terminal",
-  "lvim.core.telescope",
-  "lvim.core.treesitter",
-  "lvim.core.nvimtree",
-  "lvim.core.lir",
-  "lvim.core.illuminate",
-  "lvim.core.indentlines",
-  "lvim.core.breadcrumbs",
-  "lvim.core.project",
-  "lvim.core.bufferline",
-  "lvim.core.autopairs",
-  "lvim.core.comment",
-  "lvim.core.lualine",
-  "lvim.core.alpha",
-  "lvim.core.mason",
+  "lvim.core.builtins.which-key",
+  "lvim.core.builtins.gitsigns",
+  "lvim.core.builtins.cmp",
+  "lvim.core.builtins.dap",
+  "lvim.core.builtins.terminal",
+  "lvim.core.builtins.telescope",
+  "lvim.core.builtins.treesitter",
+  "lvim.core.builtins.nvimtree",
+  "lvim.core.builtins.lir",
+  "lvim.core.builtins.illuminate",
+  "lvim.core.builtins.indentlines",
+  "lvim.core.builtins.breadcrumbs",
+  "lvim.core.builtins.project",
+  "lvim.core.builtins.bufferline",
+  "lvim.core.builtins.autopairs",
+  "lvim.core.builtins.comment",
+  "lvim.core.builtins.lualine",
+  "lvim.core.builtins.alpha",
+  "lvim.core.builtins.mason",
 }
 
 ---@class LvimBuiltin
@@ -39,10 +38,10 @@ function M.init(config)
 end
 
 function M.setup(modname)
-  local plugin = require("lvim.core." .. modname).setup()
+  local plugin = require("lvim.core.builtins." .. modname).setup()
 
   local builtin_tbl = lvim.builtin[modname:gsub("-", "_")]
-  if type(builtin_tbl.on_config_done) == "function" then
+  if plugin and type(builtin_tbl.on_config_done) == "function" then
     builtin_tbl.on_config_done(plugin)
   end
 end
diff --git a/lua/lvim/core/lir.lua b/lua/lvim/core/builtins/lir.lua
index 9c59a99c..9c59a99c 100644
--- a/lua/lvim/core/lir.lua
+++ b/lua/lvim/core/builtins/lir.lua
diff --git a/lua/lvim/core/lualine/colors.lua b/lua/lvim/core/builtins/lualine/colors.lua
index 4984cd1f..4984cd1f 100644
--- a/lua/lvim/core/lualine/colors.lua
+++ b/lua/lvim/core/builtins/lualine/colors.lua
diff --git a/lua/lvim/core/lualine/components.lua b/lua/lvim/core/builtins/lualine/components.lua
index 033db1e0..755c42af 100644
--- a/lua/lvim/core/lualine/components.lua
+++ b/lua/lvim/core/builtins/lualine/components.lua
@@ -1,5 +1,5 @@
-local conditions = require "lvim.core.lualine.conditions"
-local colors = require "lvim.core.lualine.colors"
+local conditions = require "lvim.core.builtins.lualine.conditions"
+local colors = require "lvim.core.builtins.lualine.colors"
 
 local function diff_source()
   local gitsigns = vim.b.gitsigns_status_dict
@@ -55,7 +55,7 @@ return {
   },
   python_env = {
     function()
-      local utils = require "lvim.core.lualine.utils"
+      local utils = require "lvim.core.builtins.lualine.utils"
       if vim.bo.filetype == "python" then
         local venv = os.getenv "CONDA_DEFAULT_ENV" or os.getenv "VIRTUAL_ENV"
         if venv then
diff --git a/lua/lvim/core/lualine/conditions.lua b/lua/lvim/core/builtins/lualine/conditions.lua
index 42d52a83..42d52a83 100644
--- a/lua/lvim/core/lualine/conditions.lua
+++ b/lua/lvim/core/builtins/lualine/conditions.lua
diff --git a/lua/lvim/core/lualine/init.lua b/lua/lvim/core/builtins/lualine/init.lua
index fa17afd7..102dd6e6 100644
--- a/lua/lvim/core/lualine/init.lua
+++ b/lua/lvim/core/builtins/lualine/init.lua
@@ -44,7 +44,7 @@ M.setup = function()
     return
   end
 
-  require("lvim.core.lualine.styles").update()
+  require("lvim.core.builtins.lualine.styles").update()
 
   lualine.setup(lvim.builtin.lualine)
 
diff --git a/lua/lvim/core/lualine/styles.lua b/lua/lvim/core/builtins/lualine/styles.lua
index 81dbbabb..50b07bdd 100644
--- a/lua/lvim/core/lualine/styles.lua
+++ b/lua/lvim/core/builtins/lualine/styles.lua
@@ -1,5 +1,5 @@
 local M = {}
-local components = require "lvim.core.lualine.components"
+local components = require "lvim.core.builtins.lualine.components"
 
 local styles = {
   lvim = nil,
diff --git a/lua/lvim/core/lualine/utils.lua b/lua/lvim/core/builtins/lualine/utils.lua
index 3fd3c2d3..3fd3c2d3 100644
--- a/lua/lvim/core/lualine/utils.lua
+++ b/lua/lvim/core/builtins/lualine/utils.lua
diff --git a/lua/lvim/core/mason.lua b/lua/lvim/core/builtins/mason.lua
index 958b9e76..958b9e76 100644
--- a/lua/lvim/core/mason.lua
+++ b/lua/lvim/core/builtins/mason.lua
diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/builtins/nvimtree.lua
index a46db583..bf76407c 100644
--- a/lua/lvim/core/nvimtree.lua
+++ b/lua/lvim/core/builtins/nvimtree.lua
@@ -248,11 +248,11 @@ function M.setup()
   end
 
   local function telescope_find_files(_)
-    require("lvim.core.nvimtree").start_telescope "find_files"
+    require("lvim.core.builtin.nvimtree").start_telescope "find_files"
   end
 
   local function telescope_live_grep(_)
-    require("lvim.core.nvimtree").start_telescope "live_grep"
+    require("lvim.core.builtin.nvimtree").start_telescope "live_grep"
   end
 
   -- Add useful keymaps
diff --git a/lua/lvim/core/project.lua b/lua/lvim/core/builtins/project.lua
index 10c4a71f..10c4a71f 100644
--- a/lua/lvim/core/project.lua
+++ b/lua/lvim/core/builtins/project.lua
diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/builtins/telescope.lua
index 576c70e9..576c70e9 100644
--- a/lua/lvim/core/telescope.lua
+++ b/lua/lvim/core/builtins/telescope.lua
diff --git a/lua/lvim/core/terminal.lua b/lua/lvim/core/builtins/terminal.lua
index 2fc8ea9c..2fc8ea9c 100644
--- a/lua/lvim/core/terminal.lua
+++ b/lua/lvim/core/builtins/terminal.lua
diff --git a/lua/lvim/core/treesitter.lua b/lua/lvim/core/builtins/treesitter.lua
index 4548b792..c0cbb653 100644
--- a/lua/lvim/core/treesitter.lua
+++ b/lua/lvim/core/builtins/treesitter.lua
@@ -110,7 +110,7 @@ function M.setup()
 
   treesitter_configs.setup(opts)
 
-  return require "treesitter"
+  return require "nvim-treesitter"
 end
 
 return M
diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/builtins/which-key.lua
index cdfc91e4..cdfc91e4 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/builtins/which-key.lua
diff --git a/lua/lvim/core/commands.lua b/lua/lvim/core/commands.lua
index 2714838a..aa36d4b7 100644
--- a/lua/lvim/core/commands.lua
+++ b/lua/lvim/core/commands.lua
@@ -14,7 +14,7 @@ M.defaults = {
   {
     name = "BufferKill",
     fn = function()
-      require("lvim.core.bufferline").buf_kill "bd"
+      require("lvim.core.builtins.bufferline").buf_kill "bd"
     end,
   },
   {
diff --git a/lua/lvim/core/theme.lua b/lua/lvim/core/theme.lua
index 5a39f046..e4e122d2 100644
--- a/lua/lvim/core/theme.lua
+++ b/lua/lvim/core/theme.lua
@@ -86,10 +86,10 @@ M.setup = function()
   vim.cmd("colorscheme " .. lvim.colorscheme)
 
   if package.loaded.lualine then
-    require("lvim.core.lualine").setup()
+    require("lvim.core.builtins.lualine").setup()
   end
   if package.loaded.lir then
-    require("lvim.core.lir").icon_setup()
+    require("lvim.core.builtins.lir").icon_setup()
   end
 end