diff --git a/modules2/nixvim/plugins/auto-save.nix b/modules2/nixvim/auto-save.nix
similarity index 100%
rename from modules2/nixvim/plugins/auto-save.nix
rename to modules2/nixvim/auto-save.nix
diff --git a/modules2/nixvim/plugins/completion/cmp.nix b/modules2/nixvim/completion/cmp.nix
similarity index 100%
rename from modules2/nixvim/plugins/completion/cmp.nix
rename to modules2/nixvim/completion/cmp.nix
diff --git a/modules2/nixvim/plugins/completion/luasnip.nix b/modules2/nixvim/completion/luasnip.nix
similarity index 100%
rename from modules2/nixvim/plugins/completion/luasnip.nix
rename to modules2/nixvim/completion/luasnip.nix
diff --git a/modules2/nixvim/plugins/completion/snippets/javascript.lua b/modules2/nixvim/completion/snippets/javascript.lua
similarity index 100%
rename from modules2/nixvim/plugins/completion/snippets/javascript.lua
rename to modules2/nixvim/completion/snippets/javascript.lua
diff --git a/modules2/nixvim/plugins/completion/snippets/lua.lua b/modules2/nixvim/completion/snippets/lua.lua
similarity index 100%
rename from modules2/nixvim/plugins/completion/snippets/lua.lua
rename to modules2/nixvim/completion/snippets/lua.lua
diff --git a/modules2/nixvim/plugins/completion/snippets/nix.lua b/modules2/nixvim/completion/snippets/nix.lua
similarity index 100%
rename from modules2/nixvim/plugins/completion/snippets/nix.lua
rename to modules2/nixvim/completion/snippets/nix.lua
diff --git a/modules2/nixvim/plugins/completion/snippets/php.lua b/modules2/nixvim/completion/snippets/php.lua
similarity index 100%
rename from modules2/nixvim/plugins/completion/snippets/php.lua
rename to modules2/nixvim/completion/snippets/php.lua
diff --git a/modules2/nixvim/plugins/completion/snippets/rst.lua b/modules2/nixvim/completion/snippets/rst.lua
similarity index 100%
rename from modules2/nixvim/plugins/completion/snippets/rst.lua
rename to modules2/nixvim/completion/snippets/rst.lua
diff --git a/modules2/nixvim/plugins/completion/snippets/twig.lua b/modules2/nixvim/completion/snippets/twig.lua
similarity index 100%
rename from modules2/nixvim/plugins/completion/snippets/twig.lua
rename to modules2/nixvim/completion/snippets/twig.lua
diff --git a/modules2/nixvim/plugins/conform.nix b/modules2/nixvim/conform.nix
similarity index 100%
rename from modules2/nixvim/plugins/conform.nix
rename to modules2/nixvim/conform.nix
diff --git a/modules2/nixvim/plugins/fidget.nix b/modules2/nixvim/fidget.nix
similarity index 100%
rename from modules2/nixvim/plugins/fidget.nix
rename to modules2/nixvim/fidget.nix
diff --git a/modules2/nixvim/plugins/fugitive.nix b/modules2/nixvim/fugitive.nix
similarity index 100%
rename from modules2/nixvim/plugins/fugitive.nix
rename to modules2/nixvim/fugitive.nix
diff --git a/modules2/nixvim/plugins/gitsigns.nix b/modules2/nixvim/gitsigns.nix
similarity index 100%
rename from modules2/nixvim/plugins/gitsigns.nix
rename to modules2/nixvim/gitsigns.nix
diff --git a/modules2/nixvim/plugins/harpoon.nix b/modules2/nixvim/harpoon.nix
similarity index 100%
rename from modules2/nixvim/plugins/harpoon.nix
rename to modules2/nixvim/harpoon.nix
diff --git a/modules2/nixvim/plugins/lint.nix b/modules2/nixvim/lint.nix
similarity index 100%
rename from modules2/nixvim/plugins/lint.nix
rename to modules2/nixvim/lint.nix
diff --git a/modules2/nixvim/plugins/lsp.nix b/modules2/nixvim/lsp.nix
similarity index 100%
rename from modules2/nixvim/plugins/lsp.nix
rename to modules2/nixvim/lsp.nix
diff --git a/modules2/nixvim/plugins/lsp/bash.nix b/modules2/nixvim/lsp/bash.nix
similarity index 100%
rename from modules2/nixvim/plugins/lsp/bash.nix
rename to modules2/nixvim/lsp/bash.nix
diff --git a/modules2/nixvim/plugins/lsp/css.nix b/modules2/nixvim/lsp/css.nix
similarity index 100%
rename from modules2/nixvim/plugins/lsp/css.nix
rename to modules2/nixvim/lsp/css.nix
diff --git a/modules2/nixvim/plugins/lsp/go.nix b/modules2/nixvim/lsp/go.nix
similarity index 100%
rename from modules2/nixvim/plugins/lsp/go.nix
rename to modules2/nixvim/lsp/go.nix
diff --git a/modules2/nixvim/plugins/lsp/html.nix b/modules2/nixvim/lsp/html.nix
similarity index 100%
rename from modules2/nixvim/plugins/lsp/html.nix
rename to modules2/nixvim/lsp/html.nix
diff --git a/modules2/nixvim/plugins/lsp/javascript.nix b/modules2/nixvim/lsp/javascript.nix
similarity index 100%
rename from modules2/nixvim/plugins/lsp/javascript.nix
rename to modules2/nixvim/lsp/javascript.nix
diff --git a/modules2/nixvim/plugins/lsp/lua.nix b/modules2/nixvim/lsp/lua.nix
similarity index 100%
rename from modules2/nixvim/plugins/lsp/lua.nix
rename to modules2/nixvim/lsp/lua.nix
diff --git a/modules2/nixvim/plugins/lsp/nix.nix b/modules2/nixvim/lsp/nix.nix
similarity index 100%
rename from modules2/nixvim/plugins/lsp/nix.nix
rename to modules2/nixvim/lsp/nix.nix
diff --git a/modules2/nixvim/plugins/lsp/php.nix b/modules2/nixvim/lsp/php.nix
similarity index 100%
rename from modules2/nixvim/plugins/lsp/php.nix
rename to modules2/nixvim/lsp/php.nix
diff --git a/modules2/nixvim/plugins/mini.nix b/modules2/nixvim/mini.nix
similarity index 100%
rename from modules2/nixvim/plugins/mini.nix
rename to modules2/nixvim/mini.nix
diff --git a/modules2/nixvim/plugins/oil.nix b/modules2/nixvim/oil.nix
similarity index 100%
rename from modules2/nixvim/plugins/oil.nix
rename to modules2/nixvim/oil.nix
diff --git a/modules2/nixvim/plugins/phpactor.nix b/modules2/nixvim/phpactor.nix
similarity index 100%
rename from modules2/nixvim/plugins/phpactor.nix
rename to modules2/nixvim/phpactor.nix
diff --git a/modules2/nixvim/plugins/refactoring.nix b/modules2/nixvim/refactoring.nix
similarity index 100%
rename from modules2/nixvim/plugins/refactoring.nix
rename to modules2/nixvim/refactoring.nix
diff --git a/modules2/nixvim/plugins/telescope.nix b/modules2/nixvim/telescope.nix
similarity index 100%
rename from modules2/nixvim/plugins/telescope.nix
rename to modules2/nixvim/telescope.nix
diff --git a/modules2/nixvim/plugins/treesitter.nix b/modules2/nixvim/treesitter.nix
similarity index 100%
rename from modules2/nixvim/plugins/treesitter.nix
rename to modules2/nixvim/treesitter.nix
diff --git a/modules2/nixvim/plugins/undotree.nix b/modules2/nixvim/undotree.nix
similarity index 100%
rename from modules2/nixvim/plugins/undotree.nix
rename to modules2/nixvim/undotree.nix
diff --git a/modules2/nixvim/plugins/vim-cool.nix b/modules2/nixvim/vim-cool.nix
similarity index 100%
rename from modules2/nixvim/plugins/vim-cool.nix
rename to modules2/nixvim/vim-cool.nix
diff --git a/modules2/nixvim/plugins/vim-dadbod.nix b/modules2/nixvim/vim-dadbod.nix
similarity index 100%
rename from modules2/nixvim/plugins/vim-dadbod.nix
rename to modules2/nixvim/vim-dadbod.nix
diff --git a/modules2/nixvim/plugins/vim-highlightedyank.nix b/modules2/nixvim/vim-highlightedyank.nix
similarity index 100%
rename from modules2/nixvim/plugins/vim-highlightedyank.nix
rename to modules2/nixvim/vim-highlightedyank.nix
diff --git a/modules2/nixvim/plugins/vim-test.nix b/modules2/nixvim/vim-test.nix
similarity index 100%
rename from modules2/nixvim/plugins/vim-test.nix
rename to modules2/nixvim/vim-test.nix
diff --git a/modules2/nixvim/plugins/web-devicons.nix b/modules2/nixvim/web-devicons.nix
similarity index 100%
rename from modules2/nixvim/plugins/web-devicons.nix
rename to modules2/nixvim/web-devicons.nix