56 files changed, 224 insertions, 223 deletions
diff --git a/lua/core/builtins/init.lua b/lua/core/builtins/init.lua
deleted file mode 100644
index c3b3618f..00000000
--- a/lua/core/builtins/init.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-local M = {}
-
-local builtins = {
-  "keymappings",
-  "core.which-key",
-  "core.gitsigns",
-  "core.cmp",
-  "core.dashboard",
-  "core.dap",
-  "core.terminal",
-  "core.telescope",
-  "core.treesitter",
-  "core.nvimtree",
-  "core.project",
-  "core.bufferline",
-  "core.autopairs",
-  "core.comment",
-  "core.lualine",
-}
-
-function M.config(config)
-  for _, builtin_path in ipairs(builtins) do
-    local builtin = require(builtin_path)
-    builtin.config(config)
-  end
-end
-
-return M
diff --git a/lua/bootstrap.lua b/lua/lvim/bootstrap.lua
index 866403b7..46c044ae 100644
--- a/lua/bootstrap.lua
+++ b/lua/lvim/bootstrap.lua
@@ -1,7 +1,7 @@
 local M = {}
 
-package.loaded["utils.hooks"] = nil
-local _, hooks = pcall(require, "utils.hooks")
+package.loaded["lvim.utils.hooks"] = nil
+local _, hooks = pcall(require, "lvim.utils.hooks")
 
 ---Join path segments that were passed as input
 ---@return string
@@ -99,22 +99,25 @@ function M:init()
     vim.cmd("set spellfile=" .. join_paths(self.config_dir, "spell", "en.utf-8.add"))
   end
 
-  vim.fn.mkdir(vim.fn.stdpath "cache", "p")
+  vim.fn.mkdir(get_cache_dir(), "p")
 
   -- FIXME: currently unreliable in unit-tests
   if not os.getenv "LVIM_TEST_ENV" then
-    require("impatient").setup {
+    require("lvim.impatient").setup {
       path = vim.fn.stdpath "cache" .. "/lvim_cache",
       enable_profiling = true,
     }
   end
 
-  local config = require "config"
+  require("lvim.config"):init {
+    config_dir = self.config_dir,
+  }
+  local config = require "lvim.config"
   config:init {
-    path = join_paths(self.config_dir, "config.lua"),
+    user_config = join_paths(self.config_dir, "config.lua"),
   }
 
-  require("plugin-loader"):init {
+  require("lvim.plugin-loader"):init {
     package_root = self.pack_dir,
     install_path = self.packer_install_dir,
   }
@@ -132,7 +135,7 @@ end
 
 local function git_cmd(subcmd)
   local Job = require "plenary.job"
-  local Log = require "core.log"
+  local Log = require "lvim.core.log"
   local args = { "-C", get_install_path() }
   vim.list_extend(args, subcmd)
 
@@ -161,7 +164,7 @@ end
 
 ---pulls the latest changes from github
 function M:update_repo()
-  local Log = require "core.log"
+  local Log = require "lvim.core.log"
   local sub_commands = {
     fetch = { "fetch" },
     diff = { "diff", "--quiet", "@{upstream}" },
diff --git a/lua/config/defaults.lua b/lua/lvim/config/defaults.lua
index f030234d..ffbb2e1b 100644
--- a/lua/config/defaults.lua
+++ b/lua/lvim/config/defaults.lua
@@ -1,14 +1,9 @@
-local home_dir = vim.loop.os_homedir()
-local utils = require "utils"
-
-lvim = {
+return {
   leader = "space",
   colorscheme = "onedarker",
   line_wrap_cursor_movement = true,
   transparent_window = false,
   format_on_save = true,
-  vsnip_dir = utils.join_paths(home_dir, ".config", "snippets"),
-  database = { save_location = utils.join_paths(home_dir, ".config", "lunarvim_db"), auto_execute = 1 },
   keys = {},
 
   builtin = {},
diff --git a/lua/config/init.lua b/lua/lvim/config/init.lua
index 411f7a93..d7877f1e 100644
--- a/lua/config/init.lua
+++ b/lua/lvim/config/init.lua
@@ -1,29 +1,39 @@
+local utils = require "lvim.utils"
+local Log = require "lvim.core.log"
+
 local M = {}
 
---- Initialize lvim default configuration
--- Define lvim global variable
-function M:init(opts)
-  opts = opts or {}
-  self.path = opts.path
-  local utils = require "utils"
+local user_config_dir = get_config_dir()
+local user_config_file = utils.join_paths(user_config_dir, "config.lua")
 
-  require "config.defaults"
+-- Fallback config.lua to lv-config.lua
+if not utils.is_file(user_config_file) then
+  local lv_config = utils.join_paths(user_config_dir, "lv-config.lua")
+  Log:warn(string.format("[%s] not found, falling back to [%s]", user_config_file, lv_config))
+  user_config_file = lv_config
+end
 
-  -- Fallback config.lua to lv-config.lua
-  if not utils.is_file(self.path) then
-    local lv_config = self.path:gsub("config.lua$", "lv-config.lua")
-    print(self.path, "not found, falling back to", lv_config)
+function M:get_user_config_path()
+  return user_config_file
+end
 
-    self.path = lv_config
+--- Initialize lvim default configuration
+-- Define lvim global variable
+function M:init()
+  if vim.tbl_isempty(lvim or {}) then
+    lvim = require "lvim.config.defaults"
+    local home_dir = vim.loop.os_homedir()
+    lvim.vsnip_dir = utils.join_paths(home_dir, ".config", "snippets")
+    lvim.database = { save_location = utils.join_paths(home_dir, ".config", "lunarvim_db"), auto_execute = 1 }
   end
 
-  local builtins = require "core.builtins"
-  builtins.config(self)
+  local builtins = require "lvim.core.builtins"
+  builtins.config { user_config_file = user_config_file }
 
-  local settings = require "config.settings"
+  local settings = require "lvim.config.settings"
   settings.load_options()
 
-  local lvim_lsp_config = require "lsp.config"
+  local lvim_lsp_config = require "lvim.lsp.config"
   lvim.lsp = vim.deepcopy(lvim_lsp_config)
 
   local supported_languages = {
@@ -121,7 +131,7 @@ function M:init(opts)
     "zig",
   }
 
-  require("lsp.manager").init_defaults(supported_languages)
+  require("lvim.lsp.manager").init_defaults(supported_languages)
 end
 
 local function deprecation_notice()
@@ -131,7 +141,7 @@ local function deprecation_notice()
   end
 
   for lang, entry in pairs(lvim.lang) do
-    local deprecated_config = entry["lsp"] or {}
+    local deprecated_config = entry["lvim.lsp"] or {}
     if not vim.tbl_isempty(deprecated_config) then
       local msg = string.format(
         "Deprecation notice: [lvim.lang.%s.lsp] setting is no longer supported. See https://github.com/LunarVim/LunarVim#breaking-changes",
@@ -147,24 +157,46 @@ end
 --- Override the configuration with a user provided one
 -- @param config_path The path to the configuration overrides
 function M:load(config_path)
-  local autocmds = require "core.autocmds"
-
-  config_path = config_path or self.path
-  local ok, err = pcall(vim.cmd, "luafile " .. config_path)
+  config_path = config_path or self.get_user_config_path()
+  local ok, _ = pcall(dofile, config_path)
   if not ok then
-    print("Invalid configuration", config_path)
-    print(err)
-    return
+    Log:warn("Invalid configuration: " .. config_path)
   end
 
   deprecation_notice()
 
-  self.path = config_path
-
+  local autocmds = require "lvim.core.autocmds"
   autocmds.define_augroups(lvim.autocommands)
 
-  local settings = require "config.settings"
+  local settings = require "lvim.config.settings"
   settings.load_commands()
 end
 
+--- Override the configuration with a user provided one
+-- @param config_path The path to the configuration overrides
+function M:reload()
+  local lvim_modules = {}
+  for module, _ in pairs(package.loaded) do
+    if module:match "lvim" then
+      package.loaded.module = nil
+      table.insert(lvim_modules, module)
+    end
+  end
+
+  M:init()
+  M:load()
+
+  require("lvim.keymappings").setup() -- this should be done before loading the plugins
+  local plugins = require "lvim.plugins"
+  utils.toggle_autoformat()
+  local plugin_loader = require "lvim.plugin-loader"
+  plugin_loader:cache_reset()
+  plugin_loader:load { plugins, lvim.plugins }
+  vim.cmd ":PackerInstall"
+  vim.cmd ":PackerCompile"
+  -- vim.cmd ":PackerClean"
+  require("lvim.lsp").setup()
+  Log:info "Reloaded configuration"
+end
+
 return M
diff --git a/lua/config/settings.lua b/lua/lvim/config/settings.lua
index 90042c4f..b86e1a18 100644
--- a/lua/config/settings.lua
+++ b/lua/lvim/config/settings.lua
@@ -1,5 +1,5 @@
 local M = {}
-local utils = require "utils"
+local utils = require "lvim.utils"
 M.load_options = function()
   local default_options = {
     backup = false, -- creates a backup file
diff --git a/lua/core/autocmds.lua b/lua/lvim/core/autocmds.lua
index 662afcfa..4f29f0e1 100644
--- a/lua/core/autocmds.lua
+++ b/lua/lvim/core/autocmds.lua
@@ -1,12 +1,12 @@
 local autocommands = {}
-local config = require "config"
+local user_config_file = require("lvim.config"):get_user_config_path()
 
 lvim.autocommands = {
   _general_settings = {
     {
       "Filetype",
       "*",
-      "lua require('utils.ft').do_filetype(vim.fn.expand(\"<amatch>\"))",
+      "lua require('lvim.utils.ft').do_filetype(vim.fn.expand(\"<amatch>\"))",
     },
     {
       "FileType",
@@ -43,7 +43,7 @@ lvim.autocommands = {
       "*",
       "setlocal formatoptions-=c formatoptions-=r formatoptions-=o",
     },
-    { "BufWritePost", config.path, "lua require('utils').reload_lv_config()" },
+    { "BufWritePost", user_config_file, "lua require('lvim.config'):reload()" },
     {
       "FileType",
       "qf",
diff --git a/lua/core/autopairs.lua b/lua/lvim/core/autopairs.lua
index eb080fb1..eb080fb1 100644
--- a/lua/core/autopairs.lua
+++ b/lua/lvim/core/autopairs.lua
diff --git a/lua/core/bufferline.lua b/lua/lvim/core/bufferline.lua
index e3f6b5de..ae6542d1 100644
--- a/lua/core/bufferline.lua
+++ b/lua/lvim/core/bufferline.lua
@@ -14,7 +14,7 @@ M.config = function()
 end
 
 M.setup = function()
-  local keymap = require "keymappings"
+  local keymap = require "lvim.keymappings"
   keymap.append_to_defaults(lvim.builtin.bufferline.keymap)
 
   if lvim.builtin.bufferline.on_config_done then
diff --git a/lua/lvim/core/builtins/init.lua b/lua/lvim/core/builtins/init.lua
new file mode 100644
index 00000000..8f83072e
--- /dev/null
+++ b/lua/lvim/core/builtins/init.lua
@@ -0,0 +1,28 @@
+local M = {}
+
+local builtins = {
+  "lvim.keymappings",
+  "lvim.core.which-key",
+  "lvim.core.gitsigns",
+  "lvim.core.cmp",
+  "lvim.core.dashboard",
+  "lvim.core.dap",
+  "lvim.core.terminal",
+  "lvim.core.telescope",
+  "lvim.core.treesitter",
+  "lvim.core.nvimtree",
+  "lvim.core.project",
+  "lvim.core.bufferline",
+  "lvim.core.autopairs",
+  "lvim.core.comment",
+  "lvim.core.lualine",
+}
+
+function M.config(config)
+  for _, builtin_path in ipairs(builtins) do
+    local builtin = require(builtin_path)
+    builtin.config(config)
+  end
+end
+
+return M
diff --git a/lua/core/cmp.lua b/lua/lvim/core/cmp.lua
index ad06a360..ad06a360 100644
--- a/lua/core/cmp.lua
+++ b/lua/lvim/core/cmp.lua
diff --git a/lua/core/commands.lua b/lua/lvim/core/commands.lua
index 6ceeaaff..b750f12b 100644
--- a/lua/core/commands.lua
+++ b/lua/lvim/core/commands.lua
@@ -11,9 +11,9 @@ M.defaults = {
   endfunction
   ]],
   -- :LvimInfo
-  [[ command! LvimInfo lua require('core.info').toggle_popup(vim.bo.filetype) ]],
-  [[ command! LvimCacheReset lua require('utils.hooks').reset_cache() ]],
-  [[ command! LvimUpdate lua require('bootstrap').update() ]],
+  [[ command! LvimInfo lua require('lvim.core.info').toggle_popup(vim.bo.filetype) ]],
+  [[ command! LvimCacheReset lua require('lvim.utils.hooks').reset_cache() ]],
+  [[ command! LvimUpdate lua require('lvim.bootstrap').update() ]],
 }
 
 M.load = function(commands)
diff --git a/lua/core/comment.lua b/lua/lvim/core/comment.lua
index b98410ab..b98410ab 100644
--- a/lua/core/comment.lua
+++ b/lua/lvim/core/comment.lua
diff --git a/lua/core/dap.lua b/lua/lvim/core/dap.lua
index d9b59641..d9b59641 100644
--- a/lua/core/dap.lua
+++ b/lua/lvim/core/dap.lua
diff --git a/lua/core/dashboard.lua b/lua/lvim/core/dashboard.lua
index 505350cb..38d9d226 100644
--- a/lua/core/dashboard.lua
+++ b/lua/lvim/core/dashboard.lua
@@ -1,5 +1,5 @@
 local M = {}
-local utils = require "utils"
+local utils = require "lvim.utils"
 
 M.config = function(config)
   lvim.builtin.dashboard = {
@@ -48,7 +48,7 @@ M.config = function(config)
       },
       e = {
         description = { "  Configuration      " },
-        command = ":e " .. config.path,
+        command = ":e " .. config.user_config_file,
       },
     },
 
@@ -84,10 +84,10 @@ M.setup = function()
     table.insert(footer, 3, "v" .. lvim_version)
   end
 
-  local text = require "interface.text"
+  local text = require "lvim.interface.text"
   vim.g.dashboard_custom_footer = text.align_center({ width = 0 }, footer, 0.49) -- Use 0.49 as  counts for 2 characters
 
-  require("core.autocmds").define_augroups {
+  require("lvim.core.autocmds").define_augroups {
     _dashboard = {
       -- seems to be nobuflisted that makes my stuff disappear will do more testing
       {
diff --git a/lua/core/gitsigns.lua b/lua/lvim/core/gitsigns.lua
index cc6387dc..cc6387dc 100644
--- a/lua/core/gitsigns.lua
+++ b/lua/lvim/core/gitsigns.lua
diff --git a/lua/core/info.lua b/lua/lvim/core/info.lua
index 16001d07..7fdb665b 100644
--- a/lua/core/info.lua
+++ b/lua/lvim/core/info.lua
@@ -10,16 +10,16 @@ local M = {
 }
 
 local fmt = string.format
-local text = require "interface.text"
-local lsp_utils = require "lsp.utils"
+local text = require "lvim.interface.text"
+local lsp_utils = require "lvim.lsp.utils"
+local user_config_file = require("lvim.config"):get_user_config_path()
 
 local function str_list(list)
   return fmt("[ %s ]", table.concat(list, ", "))
 end
 
 local function get_formatter_suggestion_msg(ft)
-  local config = require "config"
-  local null_formatters = require "lsp.null-ls.formatters"
+  local null_formatters = require "lvim.lsp.null-ls.formatters"
   local supported_formatters = null_formatters.list_available(ft)
   local section = {
     " HINT ",
@@ -30,7 +30,7 @@ local function get_formatter_suggestion_msg(ft)
   if not vim.tbl_isempty(supported_formatters) then
     vim.list_extend(section, {
       "* Configured formatter needs to be installed and executable.",
-      fmt("* Enable installed formatter(s) with following config in %s", config.path),
+      fmt("* Enable installed formatter(s) with following config in %s", user_config_file),
       "",
       fmt("  lvim.lang.%s.formatters = { { exe = '%s' } }", ft, table.concat(supported_formatters, "│")),
     })
@@ -40,8 +40,7 @@ local function get_formatter_suggestion_msg(ft)
 end
 
 local function get_linter_suggestion_msg(ft)
-  local config = require "config"
-  local null_linters = require "lsp.null-ls.linters"
+  local null_linters = require "lvim.lsp.null-ls.linters"
   local supported_linters = null_linters.list_available(ft)
   local section = {
     " HINT ",
@@ -52,7 +51,7 @@ local function get_linter_suggestion_msg(ft)
   if not vim.tbl_isempty(supported_linters) then
     vim.list_extend(section, {
       "* Configured linter needs to be installed and executable.",
-      fmt("* Enable installed linter(s) with following config in %s", config.path),
+      fmt("* Enable installed linter(s) with following config in %s", user_config_file),
       "",
       fmt("  lvim.lang.%s.linters = { { exe = '%s' } }", ft, table.concat(supported_linters, "│")),
     })
@@ -108,8 +107,8 @@ function M.toggle_popup(ft)
     table.insert(client_names, client.name)
   end
 
-  local null_formatters = require "lsp.null-ls.formatters"
-  local null_linters = require "lsp.null-ls.linters"
+  local null_formatters = require "lvim.lsp.null-ls.formatters"
+  local null_linters = require "lvim.lsp.null-ls.linters"
   local registered_formatters = null_formatters.list_supported_names(ft)
   local registered_linters = null_linters.list_supported_names(ft)
   local registered_providers = {}
@@ -159,11 +158,11 @@ function M.toggle_popup(ft)
     vim.cmd 'let m=matchadd("string", "true")'
     vim.cmd 'let m=matchadd("error", "false")'
     tbl_set_highlight(registered_providers, "LvimInfoIdentifier")
-    -- tbl_set_highlight(require("lsp.null-ls.formatters").list_available(ft), "LvimInfoIdentifier")
-    -- tbl_set_highlight(require("lsp.null-ls.linters").list_available(ft), "LvimInfoIdentifier")
+    -- tbl_set_highlight(require("lvim.lsp.null-ls.formatters").list_available(ft), "LvimInfoIdentifier")
+    -- tbl_set_highlight(require("lvim.lsp.null-ls.linters").list_available(ft), "LvimInfoIdentifier")
   end
 
-  local Popup = require("interface.popup"):new {
+  local Popup = require("lvim.interface.popup"):new {
     win_opts = { number = false },
     buf_opts = { modifiable = false, filetype = "lspinfo" },
   }
diff --git a/lua/core/log.lua b/lua/lvim/core/log.lua
index fca1fcb4..fca1fcb4 100644
--- a/lua/core/log.lua
+++ b/lua/lvim/core/log.lua
diff --git a/lua/core/lualine/colors.lua b/lua/lvim/core/lualine/colors.lua
index 4984cd1f..4984cd1f 100644
--- a/lua/core/lualine/colors.lua
+++ b/lua/lvim/core/lualine/colors.lua
diff --git a/lua/core/lualine/components.lua b/lua/lvim/core/lualine/components.lua
index 3ee2fdf8..5c0fb84b 100644
--- a/lua/core/lualine/components.lua
+++ b/lua/lvim/core/lualine/components.lua
@@ -1,5 +1,5 @@
-local conditions = require "core.lualine.conditions"
-local colors = require "core.lualine.colors"
+local conditions = require "lvim.core.lualine.conditions"
+local colors = require "lvim.core.lualine.colors"
 
 local function diff_source()
   local gitsigns = vim.b.gitsigns_status_dict
@@ -46,7 +46,7 @@ return {
   },
   python_env = {
     function()
-      local utils = require "core.lualine.utils"
+      local utils = require "lvim.core.lualine.utils"
       if vim.bo.filetype == "python" then
         local venv = os.getenv "CONDA_DEFAULT_ENV"
         if venv then
@@ -103,12 +103,12 @@ return {
       end
 
       -- add formatter
-      local formatters = require "lsp.null-ls.formatters"
+      local formatters = require "lvim.lsp.null-ls.formatters"
       local supported_formatters = formatters.list_supported_names(buf_ft)
       vim.list_extend(buf_client_names, supported_formatters)
 
       -- add linter
-      local linters = require "lsp.null-ls.linters"
+      local linters = require "lvim.lsp.null-ls.linters"
       local supported_linters = linters.list_supported_names(buf_ft)
       vim.list_extend(buf_client_names, supported_linters)
 
diff --git a/lua/core/lualine/conditions.lua b/lua/lvim/core/lualine/conditions.lua
index 3ee4fbb8..3ee4fbb8 100644
--- a/lua/core/lualine/conditions.lua
+++ b/lua/lvim/core/lualine/conditions.lua
diff --git a/lua/core/lualine/init.lua b/lua/lvim/core/lualine/init.lua
index aa6fe098..c5d024c2 100644
--- a/lua/core/lualine/init.lua
+++ b/lua/lvim/core/lualine/init.lua
@@ -33,8 +33,8 @@ M.config = function()
 end
 
 M.setup = function()
-  require("core.lualine.styles").update()
-  require("core.lualine.utils").validate_theme()
+  require("lvim.core.lualine.styles").update()
+  require("lvim.core.lualine.utils").validate_theme()
 
   local lualine = require "lualine"
   lualine.setup(lvim.builtin.lualine)
diff --git a/lua/core/lualine/styles.lua b/lua/lvim/core/lualine/styles.lua
index 19097424..0843aead 100644
--- a/lua/core/lualine/styles.lua
+++ b/lua/lvim/core/lualine/styles.lua
@@ -1,5 +1,5 @@
 local M = {}
-local components = require "core.lualine.components"
+local components = require "lvim.core.lualine.components"
 
 local styles = {
   lvim = nil,
@@ -111,7 +111,7 @@ styles.lvim = {
 function M.get_style(style)
   local style_keys = vim.tbl_keys(styles)
   if not vim.tbl_contains(style_keys, style) then
-    local Log = require "core.log"
+    local Log = require "lvim.core.log"
     Log:error(
       "Invalid lualine style",
       string.format('"%s"', style),
diff --git a/lua/core/lualine/utils.lua b/lua/lvim/core/lualine/utils.lua
index cf80a99e..cf80a99e 100644
--- a/lua/core/lualine/utils.lua
+++ b/lua/lvim/core/lualine/utils.lua
diff --git a/lua/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua
index 2d131147..d9e6fb5d 100644
--- a/lua/core/nvimtree.lua
+++ b/lua/lvim/core/nvimtree.lua
@@ -1,5 +1,5 @@
 local M = {}
-local Log = require "core.log"
+local Log = require "lvim.core.log"
 
 function M.config()
   lvim.builtin.nvimtree = {
@@ -109,7 +109,7 @@ function M.setup()
     open()
   end
 
-  vim.cmd "au WinClosed * lua require('core.nvimtree').on_close()"
+  vim.cmd "au WinClosed * lua require('lvim.core.nvimtree').on_close()"
 
   if lvim.builtin.nvimtree.on_config_done then
     lvim.builtin.nvimtree.on_config_done(nvim_tree_config)
diff --git a/lua/core/project.lua b/lua/lvim/core/project.lua
index e7527440..e7527440 100644
--- a/lua/core/project.lua
+++ b/lua/lvim/core/project.lua
diff --git a/lua/core/telescope.lua b/lua/lvim/core/telescope.lua
index ba0a9ee1..35f6b4a2 100644
--- a/lua/core/telescope.lua
+++ b/lua/lvim/core/telescope.lua
@@ -1,7 +1,5 @@
 local M = {}
 
-local utils = require "utils"
-
 function M.config()
   -- Define this minimal config so that it's available if telescope is not yet available.
   lvim.builtin.telescope = {
@@ -92,8 +90,8 @@ function M.find_lunarvim_files(opts)
     layout_strategy = "bottom_pane",
     prompt_prefix = ">> ",
     prompt_title = "~ LunarVim files ~",
-    cwd = utils.join_paths(get_runtime_dir(), "lvim"),
-    find_command = { "git", "ls-files" },
+    cwd = get_runtime_dir(),
+    search_dirs = { get_runtime_dir() .. "/lvim", lvim.lsp.templates_dir },
   }
   opts = vim.tbl_deep_extend("force", theme_opts, opts)
   require("telescope.builtin").find_files(opts)
@@ -107,7 +105,8 @@ function M.grep_lunarvim_files(opts)
     layout_strategy = "bottom_pane",
     prompt_prefix = ">> ",
     prompt_title = "~ search LunarVim ~",
-    cwd = utils.join_paths(get_runtime_dir(), "lvim"),
+    cwd = get_runtime_dir(),
+    search_dirs = { get_runtime_dir() .. "/lvim", lvim.lsp.templates_dir },
   }
   opts = vim.tbl_deep_extend("force", theme_opts, opts)
   require("telescope.builtin").live_grep(opts)
diff --git a/lua/core/terminal.lua b/lua/lvim/core/terminal.lua
index 3a0c6e46..aa6989ec 100644
--- a/lua/core/terminal.lua
+++ b/lua/lvim/core/terminal.lua
@@ -1,5 +1,5 @@
 local M = {}
-local Log = require "core.log"
+local Log = require "lvim.core.log"
 
 M.config = function()
   lvim.builtin["terminal"] = {
@@ -48,7 +48,7 @@ end
 M.setup = function()
   local terminal = require "toggleterm"
   for _, exec in pairs(lvim.builtin.terminal.execs) do
-    require("core.terminal").add_exec(exec[1], exec[2], exec[3])
+    require("lvim.core.terminal").add_exec(exec[1], exec[2], exec[3])
   end
   terminal.setup(lvim.builtin.terminal)
 
@@ -61,7 +61,7 @@ M.add_exec = function(exec, keymap, name)
   vim.api.nvim_set_keymap(
     "n",
     "<leader>" .. keymap,
-    "<cmd>lua require('core.terminal')._exec_toggle('" .. exec .. "')<CR>",
+    "<cmd>lua require('lvim.core.terminal')._exec_toggle('" .. exec .. "')<CR>",
     { noremap = true, silent = true }
   )
   lvim.builtin.which_key.mappings[keymap] = name
diff --git a/lua/core/treesitter.lua b/lua/lvim/core/treesitter.lua
index d63024e6..ce99deba 100644
--- a/lua/core/treesitter.lua
+++ b/lua/lvim/core/treesitter.lua
@@ -1,5 +1,5 @@
 local M = {}
-local Log = require "core.log"
+local Log = require "lvim.core.log"
 
 M.config = function()
   lvim.builtin.treesitter = {
diff --git a/lua/core/which-key.lua b/lua/lvim/core/which-key.lua
index c9e9b2f4..15f63273 100644
--- a/lua/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -98,7 +98,7 @@ M.config = function()
         name = "Packer",
         c = { "<cmd>PackerCompile<cr>", "Compile" },
         i = { "<cmd>PackerInstall<cr>", "Install" },
-        r = { "<cmd>lua require('utils').reload_lv_config()<cr>", "Reload" },
+        r = { "<cmd>lua require('lvim.utils').reload_lv_config()<cr>", "Reload" },
         s = { "<cmd>PackerSync<cr>", "Sync" },
         S = { "<cmd>PackerStatus<cr>", "Status" },
         u = { "<cmd>PackerUpdate<cr>", "Update" },
@@ -162,9 +162,9 @@ M.config = function()
         l = { "<cmd>lua vim.lsp.codelens.run()<cr>", "CodeLens Action" },
         p = {
           name = "Peek",
-          d = { "<cmd>lua require('lsp.peek').Peek('definition')<cr>", "Definition" },
-          t = { "<cmd>lua require('lsp.peek').Peek('typeDefinition')<cr>", "Type Definition" },
-          i = { "<cmd>lua require('lsp.peek').Peek('implementation')<cr>", "Implementation" },
+          d = { "<cmd>lua require('lvim.lsp.peek').Peek('definition')<cr>", "Definition" },
+          t = { "<cmd>lua require('lvim.lsp.peek').Peek('typeDefinition')<cr>", "Type Definition" },
+          i = { "<cmd>lua require('lvim.lsp.peek').Peek('implementation')<cr>", "Implementation" },
         },
         q = { "<cmd>lua vim.lsp.diagnostic.set_loclist()<cr>", "Quickfix" },
         r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" },
@@ -181,43 +181,46 @@ M.config = function()
           "Edit config.lua",
         },
         f = {
-          "<cmd>lua require('core.telescope').find_lunarvim_files()<cr>",
+          "<cmd>lua require('lvim.core.telescope').find_lunarvim_files()<cr>",
           "Find LunarVim files",
         },
         g = {
-          "<cmd>lua require('core.telescope').grep_lunarvim_files()<cr>",
+          "<cmd>lua require('lvim.core.telescope').grep_lunarvim_files()<cr>",
           "Grep LunarVim files",
         },
-        k = { "<cmd>lua require('keymappings').print()<cr>", "View LunarVim's default keymappings" },
+        k = { "<cmd>lua require('lvim.keymappings').print()<cr>", "View LunarVim's default keymappings" },
         i = {
-          "<cmd>lua require('core.info').toggle_popup(vim.bo.filetype)<cr>",
+          "<cmd>lua require('lvim.core.info').toggle_popup(vim.bo.filetype)<cr>",
           "Toggle LunarVim Info",
         },
         I = {
-          "<cmd>lua require('core.telescope').view_lunarvim_changelog()<cr>",
+          "<cmd>lua require('lvim.core.telescope').view_lunarvim_changelog()<cr>",
           "View LunarVim's changelog",
         },
         l = {
           name = "+logs",
           d = {
-            "<cmd>lua require('core.terminal').toggle_log_view(require('core.log').get_path())<cr>",
+            "<cmd>lua require('lvim.core.terminal').toggle_log_view(require('lvim.core.log').get_path())<cr>",
             "view default log",
           },
-          D = { "<cmd>lua vim.fn.execute('edit ' .. require('core.log').get_path())<cr>", "Open the default logfile" },
-          l = { "<cmd>lua require('core.terminal').toggle_log_view(vim.lsp.get_log_path())<cr>", "view lsp log" },
+          D = {
+            "<cmd>lua vim.fn.execute('edit ' .. require('lvim.core.log').get_path())<cr>",
+            "Open the default logfile",
+          },
+          l = { "<cmd>lua require('lvim.core.terminal').toggle_log_view(vim.lsp.get_log_path())<cr>", "view lsp log" },
           L = { "<cmd>lua vim.fn.execute('edit ' .. vim.lsp.get_log_path())<cr>", "Open the LSP logfile" },
           n = {
-            "<cmd>lua require('core.terminal').toggle_log_view(os.getenv('NVIM_LOG_FILE'))<cr>",
+            "<cmd>lua require('lvim.core.terminal').toggle_log_view(os.getenv('NVIM_LOG_FILE'))<cr>",
             "view neovim log",
           },
           N = { "<cmd>edit $NVIM_LOG_FILE<cr>", "Open the Neovim logfile" },
           p = {
-            "<cmd>lua require('core.terminal').toggle_log_view('packer.nvim')<cr>",
+            "<cmd>lua require('lvim.core.terminal').toggle_log_view('packer.nvim')<cr>",
             "view packer log",
           },
           P = { "<cmd>exe 'edit '.stdpath('cache').'/packer.nvim.log'<cr>", "Open the Packer logfile" },
         },
-        r = { "<cmd>lua require('utils').reload_lv_config()<cr>", "Reload configurations" },
+        r = { "<cmd>lua require('lvim.utils').reload_lv_config()<cr>", "Reload configurations" },
         u = { "<cmd>LvimUpdate<cr>", "Update LunarVim" },
       },
       s = {
diff --git a/lua/impatient.lua b/lua/lvim/impatient.lua
index d438851c..4fdc0026 100644
--- a/lua/impatient.lua
+++ b/lua/lvim/impatient.lua
@@ -121,12 +121,12 @@ end
 function M.enable_profile()
   M.profile = {}
   M.print_profile = function()
-    M.profile["impatient"] = {
+    M.profile["lvim.impatient"] = {
       resolve = 0,
       load = impatient_dur,
       loader = "standard",
     }
-    require("impatient.profile").print_profile(M.profile)
+    require("lvim.impatient.profile").print_profile(M.profile)
   end
   vim.cmd [[command! LuaCacheProfile lua _G.__luacache.print_profile()]]
 end
diff --git a/lua/impatient/profile.lua b/lua/lvim/impatient/profile.lua
index 0f4f8236..0f4f8236 100644
--- a/lua/impatient/profile.lua
+++ b/lua/lvim/impatient/profile.lua
diff --git a/lua/interface/popup.lua b/lua/lvim/interface/popup.lua
index b628125c..b628125c 100644
--- a/lua/interface/popup.lua
+++ b/lua/lvim/interface/popup.lua
diff --git a/lua/interface/text.lua b/lua/lvim/interface/text.lua
index 6bf280e8..6bf280e8 100644
--- a/lua/interface/text.lua
+++ b/lua/lvim/interface/text.lua
diff --git a/lua/keymappings.lua b/lua/lvim/keymappings.lua
index 027ca83f..68a49393 100644
--- a/lua/keymappings.lua
+++ b/lua/lvim/keymappings.lua
@@ -1,5 +1,5 @@
 local M = {}
-local Log = require "core.log"
+local Log = require "lvim.core.log"
 
 local generic_opts_any = { noremap = true, silent = true }
 
diff --git a/lua/lsp/config.lua b/lua/lvim/lsp/config.lua
index f13d9659..30336cc2 100644
--- a/lua/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -30,9 +30,9 @@ return {
       ["gr"] = { "<cmd>lua vim.lsp.buf.references()<CR>", "Goto references" },
       ["gI"] = { "<cmd>lua vim.lsp.buf.implementation()<CR>", "Goto Implementation" },
       ["gs"] = { "<cmd>lua vim.lsp.buf.signature_help()<CR>", "show signature help" },
-      ["gp"] = { "<cmd>lua require'lsp.peek'.Peek('definition')<CR>", "Peek definition" },
+      ["gp"] = { "<cmd>lua require'lvim.lsp.peek'.Peek('definition')<CR>", "Peek definition" },
       ["gl"] = {
-        "<cmd>lua require'lsp.handlers'.show_line_diagnostics()<CR>",
+        "<cmd>lua require'lvim.lsp.handlers'.show_line_diagnostics()<CR>",
         "Show line diagnostics",
       },
     },
diff --git a/lua/lsp/handlers.lua b/lua/lvim/lsp/handlers.lua
index ffb7564a..ffb7564a 100644
--- a/lua/lsp/handlers.lua
+++ b/lua/lvim/lsp/handlers.lua
diff --git a/lua/lsp/init.lua b/lua/lvim/lsp/init.lua
index 88111005..c8d583a9 100644
--- a/lua/lsp/init.lua
+++ b/lua/lvim/lsp/init.lua
@@ -1,6 +1,6 @@
 local M = {}
-local Log = require "core.log"
-local utils = require "utils"
+local Log = require "lvim.core.log"
+local utils = require "lvim.utils"
 
 local function lsp_highlight_document(client)
   if lvim.lsp.document_highlight == false then
@@ -149,17 +149,17 @@ function M.setup()
     vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = sign.name })
   end
 
-  require("lsp.handlers").setup()
+  require("lvim.lsp.handlers").setup()
 
   if not utils.is_directory(lvim.lsp.templates_dir) then
-    require("lsp.templates").generate_templates()
+    require("lvim.lsp.templates").generate_templates()
   end
 
   bootstrap_nlsp { config_home = utils.join_paths(get_config_dir(), "lsp-settings") }
 
-  require("lsp.null-ls").setup()
+  require("lvim.lsp.null-ls").setup()
 
-  require("utils").toggle_autoformat()
+  require("lvim.utils").toggle_autoformat()
 end
 
 return M
diff --git a/lua/lsp/manager.lua b/lua/lvim/lsp/manager.lua
index 9cb81910..678a08af 100644
--- a/lua/lsp/manager.lua
+++ b/lua/lvim/lsp/manager.lua
@@ -1,7 +1,7 @@
 local M = {}
 
-local Log = require "core.log"
-local lsp_utils = require "lsp.utils"
+local Log = require "lvim.core.log"
+local lsp_utils = require "lvim.lsp.utils"
 
 function M.init_defaults(languages)
   for _, entry in ipairs(languages) do
@@ -30,12 +30,12 @@ end
 ---@return table
 local function resolve_config(name, user_config)
   local config = {
-    on_attach = require("lsp").common_on_attach,
-    on_init = require("lsp").common_on_init,
-    capabilities = require("lsp").common_capabilities(),
+    on_attach = require("lvim.lsp").common_on_attach,
+    on_init = require("lvim.lsp").common_on_init,
+    capabilities = require("lvim.lsp").common_capabilities(),
   }
 
-  local status_ok, custom_config = pcall(require, "lsp/providers/" .. name)
+  local status_ok, custom_config = pcall(require, "lvim.lsp/providers/" .. name)
   if status_ok then
     Log:debug("Using custom configuration for requested server: " .. name)
     config = vim.tbl_deep_extend("force", config, custom_config)
diff --git a/lua/lsp/null-ls/formatters.lua b/lua/lvim/lsp/null-ls/formatters.lua
index 4728b908..663e2586 100644
--- a/lua/lsp/null-ls/formatters.lua
+++ b/lua/lvim/lsp/null-ls/formatters.lua
@@ -1,8 +1,8 @@
 local M = {}
 
 local null_ls = require "null-ls"
-local services = require "lsp.null-ls.services"
-local Log = require "core.log"
+local services = require "lvim.lsp.null-ls.services"
+local Log = require "lvim.core.log"
 
 function M.list_supported_names(filetype)
   local null_ls_methods = require "null-ls.methods"
@@ -13,7 +13,7 @@ end
 
 function M.list_available(filetype)
   local formatters = {}
-  local tbl = require "utils.table"
+  local tbl = require "lvim.utils.table"
   for _, provider in pairs(null_ls.builtins.formatting) do
     if tbl.contains(provider.filetypes or {}, function(ft)
       return ft == "*" or ft == filetype
diff --git a/lua/lsp/null-ls/init.lua b/lua/lvim/lsp/null-ls/init.lua
index 0d030c22..f2d3216d 100644
--- a/lua/lsp/null-ls/init.lua
+++ b/lua/lvim/lsp/null-ls/init.lua
@@ -1,8 +1,8 @@
 local M = {}
 
-local Log = require "core.log"
-local formatters = require "lsp.null-ls.formatters"
-local linters = require "lsp.null-ls.linters"
+local Log = require "lvim.core.log"
+local formatters = require "lvim.lsp.null-ls.formatters"
+local linters = require "lvim.lsp.null-ls.linters"
 
 function M:setup()
   local status_ok, null_ls = pcall(require, "null-ls")
diff --git a/lua/lsp/null-ls/linters.lua b/lua/lvim/lsp/null-ls/linters.lua
index 549c6cdd..9ea2d55b 100644
--- a/lua/lsp/null-ls/linters.lua
+++ b/lua/lvim/lsp/null-ls/linters.lua
@@ -1,8 +1,8 @@
 local M = {}
 
 local null_ls = require "null-ls"
-local services = require "lsp.null-ls.services"
-local Log = require "core.log"
+local services = require "lvim.lsp.null-ls.services"
+local Log = require "lvim.core.log"
 
 function M.list_supported_names(filetype)
   local null_ls_methods = require "null-ls.methods"
@@ -13,7 +13,7 @@ end
 
 function M.list_available(filetype)
   local linters = {}
-  local tbl = require "utils.table"
+  local tbl = require "lvim.utils.table"
   for _, provider in pairs(null_ls.builtins.diagnostics) do
     if tbl.contains(provider.filetypes or {}, function(ft)
       return ft == "*" or ft == filetype
diff --git a/lua/lsp/null-ls/services.lua b/lua/lvim/lsp/null-ls/services.lua
index ef9e7d22..9cb29f49 100644
--- a/lua/lsp/null-ls/services.lua
+++ b/lua/lvim/lsp/null-ls/services.lua
@@ -2,7 +2,7 @@ local M = {}
 
 local function find_root_dir()
   local util = require "lspconfig/util"
-  local lsp_utils = require "lsp.utils"
+  local lsp_utils = require "lvim.lsp.utils"
 
   local ts_client = lsp_utils.is_client_active "typescript"
   if ts_client then
diff --git a/lua/lsp/peek.lua b/lua/lvim/lsp/peek.lua
index cb00488e..08345aff 100644
--- a/lua/lsp/peek.lua
+++ b/lua/lvim/lsp/peek.lua
@@ -130,7 +130,7 @@ function M.Peek(what)
       M.floating_buf,
       "n",
       "<CR>",
-      ":lua require('lsp.peek').open_file()<CR>",
+      ":lua require('lvim.lsp.peek').open_file()<CR>",
       { noremap = true, silent = true }
     )
   else
diff --git a/lua/lsp/providers/jsonls.lua b/lua/lvim/lsp/providers/jsonls.lua
index 1fffa686..1fffa686 100644
--- a/lua/lsp/providers/jsonls.lua
+++ b/lua/lvim/lsp/providers/jsonls.lua
diff --git a/lua/lsp/providers/sumneko_lua.lua b/lua/lvim/lsp/providers/sumneko_lua.lua
index 4fee1fd1..6585c8c7 100644
--- a/lua/lsp/providers/sumneko_lua.lua
+++ b/lua/lvim/lsp/providers/sumneko_lua.lua
@@ -6,7 +6,7 @@ local opts = {
       },
       workspace = {
         library = {
-          [require("utils").join_paths(get_runtime_dir(), "lvim", "lua")] = true,
+          [require("lvim.utils").join_paths(get_runtime_dir(), "lvim", "lua")] = true,
           [vim.fn.expand "$VIMRUNTIME/lua"] = true,
           [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
         },
diff --git a/lua/lsp/providers/vuels.lua b/lua/lvim/lsp/providers/vuels.lua
index 3f44275d..326363fd 100644
--- a/lua/lsp/providers/vuels.lua
+++ b/lua/lvim/lsp/providers/vuels.lua
@@ -1,7 +1,7 @@
 local opts = {
   setup = {
     root_dir = function(fname)
-      local util = require "lspconfig/util"
+      local util = require "lvim.lspconfig/util"
       return util.root_pattern "package.json"(fname) or util.root_pattern "vue.config.js"(fname) or vim.fn.getcwd()
     end,
     init_options = {
diff --git a/lua/lsp/providers/yamlls.lua b/lua/lvim/lsp/providers/yamlls.lua
index 156a35b0..156a35b0 100644
--- a/lua/lsp/providers/yamlls.lua
+++ b/lua/lvim/lsp/providers/yamlls.lua
diff --git a/lua/lsp/templates.lua b/lua/lvim/lsp/templates.lua
index fbbc37f6..e0741b1b 100644
--- a/lua/lsp/templates.lua
+++ b/lua/lvim/lsp/templates.lua
@@ -1,8 +1,8 @@
 local M = {}
 
-local Log = require "core.log"
-local utils = require "utils"
-local get_supported_filetypes = require("lsp.utils").get_supported_filetypes
+local Log = require "lvim.core.log"
+local utils = require "lvim.utils"
+local get_supported_filetypes = require("lvim.lsp.utils").get_supported_filetypes
 
 local ftplugin_dir = lvim.lsp.templates_dir
 
@@ -59,7 +59,7 @@ function M.generate_ftplugin(server_name, dir)
 
   for _, filetype in ipairs(filetypes) do
     local filename = join_paths(dir, filetype .. ".lua")
-    local setup_cmd = string.format([[require("lsp.manager").setup(%q)]], server_name)
+    local setup_cmd = string.format([[require("lvim.lsp.manager").setup(%q)]], server_name)
     -- print("using setup_cmd: " .. setup_cmd)
     -- overwrite the file completely
     utils.write_file(filename, setup_cmd .. "\n", "a")
diff --git a/lua/lsp/utils.lua b/lua/lvim/lsp/utils.lua
index 59003406..a34fbf44 100644
--- a/lua/lsp/utils.lua
+++ b/lua/lvim/lsp/utils.lua
@@ -1,6 +1,6 @@
 local M = {}
 
-local tbl = require "utils.table"
+local tbl = require "lvim.utils.table"
 
 function M.is_client_active(name)
   local clients = vim.lsp.get_active_clients()
diff --git a/lua/lualine/themes/onedarker.lua b/lua/lvim/lualine/themes/onedarker.lua
index 396657bb..396657bb 100644
--- a/lua/lualine/themes/onedarker.lua
+++ b/lua/lvim/lualine/themes/onedarker.lua
diff --git a/lua/plugin-loader.lua b/lua/lvim/plugin-loader.lua
index c20dd21a..feef7ea7 100644
--- a/lua/plugin-loader.lua
+++ b/lua/lvim/plugin-loader.lua
@@ -1,7 +1,7 @@
 local plugin_loader = {}
 
-local utils = require "utils"
-local Log = require "core.log"
+local utils = require "lvim.utils"
+local Log = require "lvim.core.log"
 -- we need to reuse this outside of init()
 local compile_path = get_config_dir() .. "/plugin/packer_compiled.lua"
 
diff --git a/lua/plugins.lua b/lua/lvim/plugins.lua
index 923ff7c2..fcb23328 100644
--- a/lua/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -15,7 +15,7 @@ return {
   {
     "nvim-telescope/telescope.nvim",
     config = function()
-      require("core.telescope").setup()
+      require("lvim.core.telescope").setup()
     end,
     disable = not lvim.builtin.telescope.active,
   },
@@ -23,7 +23,7 @@ return {
   {
     "hrsh7th/nvim-cmp",
     config = function()
-      require("core.cmp").setup()
+      require("lvim.core.cmp").setup()
     end,
     requires = {
       "L3MON4D3/LuaSnip",
@@ -36,7 +36,7 @@ return {
     run = function()
       -- cmp's config requires cmp to be installed to run the first time
       if not lvim.builtin.cmp then
-        require("core.cmp").config()
+        require("lvim.core.cmp").config()
       end
     end,
   },
@@ -51,7 +51,7 @@ return {
     "windwp/nvim-autopairs",
     -- event = "InsertEnter",
     config = function()
-      require("core.autopairs").setup()
+      require("lvim.core.autopairs").setup()
     end,
     disable = not lvim.builtin.autopairs.active,
   },
@@ -62,7 +62,7 @@ return {
     branch = "0.5-compat",
     -- run = ":TSUpdate",
     config = function()
-      require("core.treesitter").setup()
+      require("lvim.core.treesitter").setup()
     end,
   },
 
@@ -73,7 +73,7 @@ return {
     -- cmd = "NvimTreeToggle",
     -- commit = "fd7f60e242205ea9efc9649101c81a07d5f458bb",
     config = function()
-      require("core.nvimtree").setup()
+      require("lvim.core.nvimtree").setup()
     end,
     disable = not lvim.builtin.nvimtree.active,
   },
@@ -82,7 +82,7 @@ return {
     "lewis6991/gitsigns.nvim",
 
     config = function()
-      require("core.gitsigns").setup()
+      require("lvim.core.gitsigns").setup()
     end,
     event = "BufRead",
     disable = not lvim.builtin.gitsigns.active,
@@ -92,7 +92,7 @@ return {
   {
     "folke/which-key.nvim",
     config = function()
-      require("core.which-key").setup()
+      require("lvim.core.which-key").setup()
     end,
     event = "BufWinEnter",
     disable = not lvim.builtin.which_key.active,
@@ -103,7 +103,7 @@ return {
     "terrortylor/nvim-comment",
     event = "BufRead",
     config = function()
-      require("core.comment").setup()
+      require("lvim.core.comment").setup()
     end,
     disable = not lvim.builtin.comment.active,
   },
@@ -112,7 +112,7 @@ return {
   {
     "ahmedkhalf/project.nvim",
     config = function()
-      require("core.project").setup()
+      require("lvim.core.project").setup()
     end,
     disable = not lvim.builtin.project.active,
   },
@@ -126,7 +126,7 @@ return {
     "shadmansaleh/lualine.nvim",
     -- "Lunarvim/lualine.nvim",
     config = function()
-      require("core.lualine").setup()
+      require("lvim.core.lualine").setup()
     end,
     disable = not lvim.builtin.lualine.active,
   },
@@ -134,7 +134,7 @@ return {
   {
     "romgrk/barbar.nvim",
     config = function()
-      require("core.bufferline").setup()
+      require("lvim.core.bufferline").setup()
     end,
     event = "BufWinEnter",
     disable = not lvim.builtin.bufferline.active,
@@ -145,7 +145,7 @@ return {
     "mfussenegger/nvim-dap",
     -- event = "BufWinEnter",
     config = function()
-      require("core.dap").setup()
+      require("lvim.core.dap").setup()
     end,
     disable = not lvim.builtin.dap.active,
   },
@@ -163,7 +163,7 @@ return {
     "ChristianChiarulli/dashboard-nvim",
     event = "BufWinEnter",
     config = function()
-      require("core.dashboard").setup()
+      require("lvim.core.dashboard").setup()
     end,
     disable = not lvim.builtin.dashboard.active,
   },
@@ -173,7 +173,7 @@ return {
     "akinsho/toggleterm.nvim",
     event = "BufWinEnter",
     config = function()
-      require("core.terminal").setup()
+      require("lvim.core.terminal").setup()
     end,
     disable = not lvim.builtin.terminal.active,
   },
diff --git a/lua/utils/ft.lua b/lua/lvim/utils/ft.lua
index e9852e6f..e9852e6f 100644
--- a/lua/utils/ft.lua
+++ b/lua/lvim/utils/ft.lua
diff --git a/lua/utils/hooks.lua b/lua/lvim/utils/hooks.lua
index fa667cfd..d536bc76 100644
--- a/lua/utils/hooks.lua
+++ b/lua/lvim/utils/hooks.lua
@@ -1,24 +1,26 @@
 local M = {}
 
-local Log = require "core.log"
+local Log = require "lvim.core.log"
 local in_headless = #vim.api.nvim_list_uis() == 0
 
 function M.run_pre_update()
   Log:debug "Starting pre-update hook"
+  _G.__luacache.clear_cache()
 end
 
 ---Reset any startup cache files used by Packer and Impatient
+---It also forces regenerating any template ftplugin files
 ---Tip: Useful for clearing any outdated settings
 function M.reset_cache()
   _G.__luacache.clear_cache()
-  require("plugin-loader"):cache_reset()
+  require("lvim.plugin-loader"):cache_reset()
+  package.loaded["lvim.lsp.templates"] = nil
+  require("lvim.lsp.templates").generate_templates()
 end
 
 function M.run_post_update()
-  M.reset_cache()
   Log:debug "Starting post-update hook"
-  package.loaded["lsp.templates"] = nil
-  require("lsp.templates").generate_templates()
+  M.reset_cache()
 
   if not in_headless then
     vim.schedule(function()
diff --git a/lua/utils/init.lua b/lua/lvim/utils/init.lua
index eaac54f4..cebbe75c 100644
--- a/lua/utils/init.lua
+++ b/lua/lvim/utils/init.lua
@@ -1,5 +1,5 @@
 local utils = {}
-local Log = require "core.log"
+local Log = require "lvim.core.log"
 local uv = vim.loop
 
 -- recursive Print (structure, limit, separator)
@@ -61,7 +61,7 @@ end
 -- autoformat
 function utils.toggle_autoformat()
   if lvim.format_on_save then
-    require("core.autocmds").define_augroups {
+    require("lvim.core.autocmds").define_augroups {
       autoformat = {
         {
           "BufWritePre",
@@ -83,26 +83,6 @@ function utils.toggle_autoformat()
   end
 end
 
-function utils.reload_lv_config()
-  require("core.lualine").config()
-
-  local config = require "config"
-  config:load()
-
-  require("keymappings").setup() -- this should be done before loading the plugins
-  vim.cmd("source " .. utils.join_paths(get_runtime_dir(), "lvim", "lua", "plugins.lua"))
-  local plugins = require "plugins"
-  utils.toggle_autoformat()
-  local plugin_loader = require "plugin-loader"
-  plugin_loader:cache_reset()
-  plugin_loader:load { plugins, lvim.plugins }
-  vim.cmd ":PackerInstall"
-  vim.cmd ":PackerCompile"
-  -- vim.cmd ":PackerClean"
-  require("lsp").setup()
-  Log:info "Reloaded configuration"
-end
-
 function utils.unrequire(m)
   package.loaded[m] = nil
   _G[m] = nil
@@ -147,18 +127,6 @@ function utils.is_directory(path)
   return stat and stat.type == "directory" or false
 end
 
-function utils.write_file(path, txt, flag)
-  uv.fs_open(path, flag, 438, function(open_err, fd)
-    assert(not open_err, open_err)
-    uv.fs_write(fd, txt, -1, function(write_err)
-      assert(not write_err, write_err)
-      uv.fs_close(fd, function(close_err)
-        assert(not close_err, close_err)
-      end)
-    end)
-  end)
-end
-
 utils.join_paths = _G.join_paths
 
 function utils.write_file(path, txt, flag)
@@ -215,7 +183,7 @@ function utils.file_contains(file, query)
 end
 
 function utils.log_contains(query)
-  local logfile = require("core.log"):get_path()
+  local logfile = require("lvim.core.log"):get_path()
   local stdout, ret, stderr = utils.search_file(logfile, query)
   if ret == 0 then
     return true
diff --git a/lua/utils/table.lua b/lua/lvim/utils/table.lua
index 1ac5949e..1ac5949e 100644
--- a/lua/utils/table.lua
+++ b/lua/lvim/utils/table.lua