diff --git a/modules/home-manager/cli/neovim/default.nix b/modules/home-manager/cli/neovim/default.nix
index b40ce80..30763f3 100644
--- a/modules/home-manager/cli/neovim/default.nix
+++ b/modules/home-manager/cli/neovim/default.nix
@@ -81,12 +81,12 @@ in
         {
           plugin = catppuccin-nvim;
           type = "lua";
-          config = (builtins.readFile ./files/theme.lua);
+          config = (builtins.readFile ./files/plugins/theme.lua);
         }
         {
           plugin = nvim-cmp;
           type = "lua";
-          config = (builtins.readFile ./files/cmp.lua);
+          config = (builtins.readFile ./files/plugins/cmp.lua);
         }
         cmp-buffer
         cmp-nvim-lsp
@@ -96,17 +96,17 @@ in
         {
           plugin = conform-nvim;
           type = "lua";
-          config = (builtins.readFile ./files/conform.lua);
+          config = (builtins.readFile ./files/plugins/conform.lua);
         }
         {
           plugin = fzf-lua;
           type = "lua";
-          config = (builtins.readFile ./files/fzf-lua.lua);
+          config = (builtins.readFile ./files/plugins/fzf-lua.lua);
         }
         {
           plugin = gitsigns-nvim;
           type = "lua";
-          config = (builtins.readFile ./files/luasnip.lua);
+          config = (builtins.readFile ./files/plugins/luasnip.lua);
         }
         {
           plugin = indent-blankline-nvim;
@@ -120,13 +120,13 @@ in
         {
           plugin = lualine-nvim;
           type = "lua";
-          config = (builtins.readFile ./files/lualine.lua);
+          config = (builtins.readFile ./files/plugins/lualine.lua);
         }
         luasnip
         {
          plugin = neo-tree-nvim;
          type = "lua";
-         config = (builtins.readFile ./files/neotree.lua);
+         config = (builtins.readFile ./files/plugins/neotree.lua);
         }
         nui-nvim
         {
@@ -139,12 +139,12 @@ in
         {
           plugin = nvim-lint;
           type = "lua";
-          config = ( builtins.readFile ./files/nvim-lint.lua);
+          config = ( builtins.readFile ./files/plugins/nvim-lint.lua);
         }
         {
           plugin = nvim-sops;
           type = "lua";
-          config = (builtins.readFile ./files/nvim-sops.lua);
+          config = (builtins.readFile ./files/plugins/nvim-sops.lua);
         }
         plenary-nvim
         {
@@ -173,12 +173,12 @@ in
             ])
           );
           type = "lua";
-          config = ( builtins.readFile ./files/treesitter.lua);
+          config = ( builtins.readFile ./files/plugins/treesitter.lua);
         }
         {
           plugin = nvim-treesitter-context;
           type = "lua";
-          config = ( builtins.readFile ./files/treesitter_context.lua);
+          config = ( builtins.readFile ./files/plugins/treesitter_context.lua);
 
         }
         {
@@ -198,12 +198,12 @@ in
         {
           plugin = which-key-nvim;
           type = "lua";
-          config = ( builtins.readFile ./files/whichkey.lua );
+          config = ( builtins.readFile ./files/plugins/whichkey.lua );
         }
         {
           plugin = nvim-k8s-lsp ;
           type = "lua";
-          config = ( builtins.readFile files/nvim-k8s-lsp.lua );
+          config = ( builtins.readFile ./files/plugins/nvim-k8s-lsp.lua );
         }
         vim-helm
       ];
diff --git a/modules/home-manager/cli/neovim/files/lsp-line.lua b/modules/home-manager/cli/neovim/files/lsp-line.lua
deleted file mode 100644
index 78aa9ad..0000000
--- a/modules/home-manager/cli/neovim/files/lsp-line.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-require('lsp_lines').setup()
-vim.diagnostic.config({ virtual_lines = true })
-
--- Disable virtual_text since it's redundant due to lsp_lines.
-vim.diagnostic.config({
-  virtual_text = false,
-})
diff --git a/modules/home-manager/cli/neovim/files/lspconfig.lua b/modules/home-manager/cli/neovim/files/lspconfig.lua
deleted file mode 100644
index 805d625..0000000
--- a/modules/home-manager/cli/neovim/files/lspconfig.lua
+++ /dev/null
@@ -1,64 +0,0 @@
-local lspconfig = require('lspconfig')
-local capabilities = require("cmp_nvim_lsp").default_capabilities()
-require("yaml-companion").open_ui_select()
-
-lspconfig.clangd.setup {
-    capabilities = capabilities,
-}
-
-lspconfig.eslint.setup{
-    capabilities = capabilities,
-}
-
--- YAML configuration (quite big!)
-
-vim.api.nvim_create_autocmd('LspAttach', {
-  desc = 'LSP actions',
-  callback = function(ev)
-    local bufmap = function(mode, lhs, rhs)
-      local opts = {buffer = true}
-      vim.keymap.set(mode, lhs, rhs, opts)
-    end
-
-    -- Displays hover information about the symbol under the cursor
-    bufmap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
-
-    -- Jump to the definition
-    bufmap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>')
-
-    -- Jump to declaration
-    bufmap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>')
-
-    -- Lists all the implementations for the symbol under the cursor
-    bufmap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>')
-
-    -- Jumps to the definition of the type symbol
-    bufmap('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<cr>')
-
-    -- Lists all the references
-    bufmap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<cr>')
-
-    -- Displays a function's signature information
-    bufmap('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
-
-    -- Renames all references to the symbol under the cursor
-    bufmap('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>')
-
-    -- Selects a code action available at the current cursor position
-    bufmap('n', '<F4>', '<cmd>lua vim.lsp.buf.code_action()<cr>')
-    bufmap('x', '<F4>', '<cmd>lua vim.lsp.buf.range_code_action()<cr>')
-
-    -- Show diagnostics in a floating window
-    bufmap('n', 'gl', '<cmd>lua vim.diagnostic.open_float()<cr>')
-
-    -- Move to the previous diagnostic
-    bufmap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
-
-    -- Move to the next diagnostic
-    bufmap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
-    local client = vim.lsp.get_client_by_id(ev.data.client_id)
-    if client and (client.name == "yamlls" or client.name == "helm_ls") then
-      bufmap ('n', '<F3>', '<cmd>lua require("yaml-companion").open_ui_select()<cr>')
-    end
-  end
-})
diff --git a/modules/home-manager/cli/neovim/files/cmp.lua b/modules/home-manager/cli/neovim/files/plugins/cmp.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/cmp.lua
rename to modules/home-manager/cli/neovim/files/plugins/cmp.lua
diff --git a/modules/home-manager/cli/neovim/files/conform.lua b/modules/home-manager/cli/neovim/files/plugins/conform.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/conform.lua
rename to modules/home-manager/cli/neovim/files/plugins/conform.lua
diff --git a/modules/home-manager/cli/neovim/files/fzf-lua.lua b/modules/home-manager/cli/neovim/files/plugins/fzf-lua.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/fzf-lua.lua
rename to modules/home-manager/cli/neovim/files/plugins/fzf-lua.lua
diff --git a/modules/home-manager/cli/neovim/files/lualine.lua b/modules/home-manager/cli/neovim/files/plugins/lualine.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/lualine.lua
rename to modules/home-manager/cli/neovim/files/plugins/lualine.lua
diff --git a/modules/home-manager/cli/neovim/files/luasnip.lua b/modules/home-manager/cli/neovim/files/plugins/luasnip.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/luasnip.lua
rename to modules/home-manager/cli/neovim/files/plugins/luasnip.lua
diff --git a/modules/home-manager/cli/neovim/files/neotree.lua b/modules/home-manager/cli/neovim/files/plugins/neotree.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/neotree.lua
rename to modules/home-manager/cli/neovim/files/plugins/neotree.lua
diff --git a/modules/home-manager/cli/neovim/files/nvim-k8s-lsp.lua b/modules/home-manager/cli/neovim/files/plugins/nvim-k8s-lsp.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/nvim-k8s-lsp.lua
rename to modules/home-manager/cli/neovim/files/plugins/nvim-k8s-lsp.lua
diff --git a/modules/home-manager/cli/neovim/files/nvim-lint.lua b/modules/home-manager/cli/neovim/files/plugins/nvim-lint.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/nvim-lint.lua
rename to modules/home-manager/cli/neovim/files/plugins/nvim-lint.lua
diff --git a/modules/home-manager/cli/neovim/files/nvim-sops.lua b/modules/home-manager/cli/neovim/files/plugins/nvim-sops.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/nvim-sops.lua
rename to modules/home-manager/cli/neovim/files/plugins/nvim-sops.lua
diff --git a/modules/home-manager/cli/neovim/files/theme.lua b/modules/home-manager/cli/neovim/files/plugins/theme.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/theme.lua
rename to modules/home-manager/cli/neovim/files/plugins/theme.lua
diff --git a/modules/home-manager/cli/neovim/files/treesitter.lua b/modules/home-manager/cli/neovim/files/plugins/treesitter.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/treesitter.lua
rename to modules/home-manager/cli/neovim/files/plugins/treesitter.lua
diff --git a/modules/home-manager/cli/neovim/files/treesitter_context.lua b/modules/home-manager/cli/neovim/files/plugins/treesitter_context.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/treesitter_context.lua
rename to modules/home-manager/cli/neovim/files/plugins/treesitter_context.lua
diff --git a/modules/home-manager/cli/neovim/files/whichkey.lua b/modules/home-manager/cli/neovim/files/plugins/whichkey.lua
similarity index 100%
rename from modules/home-manager/cli/neovim/files/whichkey.lua
rename to modules/home-manager/cli/neovim/files/plugins/whichkey.lua