diff --git a/plugins/git/committia.nix b/plugins/by-name/committia/default.nix
similarity index 100%
rename from plugins/git/committia.nix
rename to plugins/by-name/committia/default.nix
diff --git a/plugins/git/diffview.nix b/plugins/by-name/diffview/default.nix
similarity index 100%
rename from plugins/git/diffview.nix
rename to plugins/by-name/diffview/default.nix
diff --git a/plugins/git/fugitive.nix b/plugins/by-name/fugitive/default.nix
similarity index 100%
rename from plugins/git/fugitive.nix
rename to plugins/by-name/fugitive/default.nix
diff --git a/plugins/git/git-conflict.nix b/plugins/by-name/git-conflict/default.nix
similarity index 100%
rename from plugins/git/git-conflict.nix
rename to plugins/by-name/git-conflict/default.nix
diff --git a/plugins/git/git-worktree.nix b/plugins/by-name/git-worktree/default.nix
similarity index 100%
rename from plugins/git/git-worktree.nix
rename to plugins/by-name/git-worktree/default.nix
diff --git a/plugins/git/gitblame.nix b/plugins/by-name/gitblame/default.nix
similarity index 100%
rename from plugins/git/gitblame.nix
rename to plugins/by-name/gitblame/default.nix
diff --git a/plugins/git/gitgutter.nix b/plugins/by-name/gitgutter/default.nix
similarity index 100%
rename from plugins/git/gitgutter.nix
rename to plugins/by-name/gitgutter/default.nix
diff --git a/plugins/git/gitignore.nix b/plugins/by-name/gitignore/default.nix
similarity index 100%
rename from plugins/git/gitignore.nix
rename to plugins/by-name/gitignore/default.nix
diff --git a/plugins/git/gitlinker.nix b/plugins/by-name/gitlinker/default.nix
similarity index 100%
rename from plugins/git/gitlinker.nix
rename to plugins/by-name/gitlinker/default.nix
diff --git a/plugins/git/gitmessenger.nix b/plugins/by-name/gitmessenger/default.nix
similarity index 100%
rename from plugins/git/gitmessenger.nix
rename to plugins/by-name/gitmessenger/default.nix
diff --git a/plugins/git/gitsigns/default.nix b/plugins/by-name/gitsigns/default.nix
similarity index 100%
rename from plugins/git/gitsigns/default.nix
rename to plugins/by-name/gitsigns/default.nix
diff --git a/plugins/git/gitsigns/options.nix b/plugins/by-name/gitsigns/options.nix
similarity index 100%
rename from plugins/git/gitsigns/options.nix
rename to plugins/by-name/gitsigns/options.nix
diff --git a/plugins/git/lazygit.nix b/plugins/by-name/lazygit/default.nix
similarity index 100%
rename from plugins/git/lazygit.nix
rename to plugins/by-name/lazygit/default.nix
diff --git a/plugins/git/neogit/default.nix b/plugins/by-name/neogit/default.nix
similarity index 100%
rename from plugins/git/neogit/default.nix
rename to plugins/by-name/neogit/default.nix
diff --git a/plugins/git/neogit/options.nix b/plugins/by-name/neogit/options.nix
similarity index 100%
rename from plugins/git/neogit/options.nix
rename to plugins/by-name/neogit/options.nix
diff --git a/plugins/git/octo.nix b/plugins/by-name/octo/default.nix
similarity index 100%
rename from plugins/git/octo.nix
rename to plugins/by-name/octo/default.nix
diff --git a/plugins/default.nix b/plugins/default.nix
index e865bf58..1f9e0a89 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -24,21 +24,6 @@
     ./colorschemes/tokyonight.nix
     ./colorschemes/vscode.nix
 
-    ./git/committia.nix
-    ./git/diffview.nix
-    ./git/fugitive.nix
-    ./git/git-conflict.nix
-    ./git/git-worktree.nix
-    ./git/gitblame.nix
-    ./git/gitgutter.nix
-    ./git/gitignore.nix
-    ./git/gitlinker.nix
-    ./git/gitmessenger.nix
-    ./git/gitsigns
-    ./git/lazygit.nix
-    ./git/neogit
-    ./git/octo.nix
-
     ./languages/clangd-extensions.nix
     ./languages/cmake-tools.nix
     ./languages/debugprint.nix
diff --git a/tests/test-sources/plugins/git/committia.nix b/tests/test-sources/plugins/by-name/committia/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/committia.nix
rename to tests/test-sources/plugins/by-name/committia/default.nix
diff --git a/tests/test-sources/plugins/git/diffview.nix b/tests/test-sources/plugins/by-name/diffview/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/diffview.nix
rename to tests/test-sources/plugins/by-name/diffview/default.nix
diff --git a/tests/test-sources/plugins/git/git-conflict.nix b/tests/test-sources/plugins/by-name/git-conflict/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/git-conflict.nix
rename to tests/test-sources/plugins/by-name/git-conflict/default.nix
diff --git a/tests/test-sources/plugins/git/git-worktree.nix b/tests/test-sources/plugins/by-name/git-worktree/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/git-worktree.nix
rename to tests/test-sources/plugins/by-name/git-worktree/default.nix
diff --git a/tests/test-sources/plugins/git/gitblame.nix b/tests/test-sources/plugins/by-name/gitblame/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/gitblame.nix
rename to tests/test-sources/plugins/by-name/gitblame/default.nix
diff --git a/tests/test-sources/plugins/git/gitgutter.nix b/tests/test-sources/plugins/by-name/gitgutter/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/gitgutter.nix
rename to tests/test-sources/plugins/by-name/gitgutter/default.nix
diff --git a/tests/test-sources/plugins/git/gitignore.nix b/tests/test-sources/plugins/by-name/gitignore/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/gitignore.nix
rename to tests/test-sources/plugins/by-name/gitignore/default.nix
diff --git a/tests/test-sources/plugins/git/gitlinker.nix b/tests/test-sources/plugins/by-name/gitlinker/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/gitlinker.nix
rename to tests/test-sources/plugins/by-name/gitlinker/default.nix
diff --git a/tests/test-sources/plugins/git/gitsigns.nix b/tests/test-sources/plugins/by-name/gitsigns/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/gitsigns.nix
rename to tests/test-sources/plugins/by-name/gitsigns/default.nix
diff --git a/tests/test-sources/plugins/git/lazygit.nix b/tests/test-sources/plugins/by-name/lazygit/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/lazygit.nix
rename to tests/test-sources/plugins/by-name/lazygit/default.nix
diff --git a/tests/test-sources/plugins/git/neogit.nix b/tests/test-sources/plugins/by-name/neogit/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/neogit.nix
rename to tests/test-sources/plugins/by-name/neogit/default.nix
diff --git a/tests/test-sources/plugins/git/octo.nix b/tests/test-sources/plugins/by-name/octo/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/octo.nix
rename to tests/test-sources/plugins/by-name/octo/default.nix