diff --git a/plugins/bufferlines/barbar.nix b/plugins/by-name/barbar/default.nix
similarity index 100%
rename from plugins/bufferlines/barbar.nix
rename to plugins/by-name/barbar/default.nix
diff --git a/plugins/bufferlines/barbecue.nix b/plugins/by-name/barbecue/default.nix
similarity index 100%
rename from plugins/bufferlines/barbecue.nix
rename to plugins/by-name/barbecue/default.nix
diff --git a/plugins/bufferlines/bufferline.nix b/plugins/by-name/bufferline/default.nix
similarity index 100%
rename from plugins/bufferlines/bufferline.nix
rename to plugins/by-name/bufferline/default.nix
diff --git a/plugins/bufferlines/navic.nix b/plugins/by-name/navic/default.nix
similarity index 100%
rename from plugins/bufferlines/navic.nix
rename to plugins/by-name/navic/default.nix
diff --git a/plugins/default.nix b/plugins/default.nix
index 43ad28c2..f3b8ea10 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -1,10 +1,5 @@
 {
   imports = [
-    ./bufferlines/barbar.nix
-    ./bufferlines/barbecue.nix
-    ./bufferlines/bufferline.nix
-    ./bufferlines/navic.nix
-
     ./colorschemes/ayu.nix
     ./colorschemes/base16
     ./colorschemes/catppuccin.nix
diff --git a/tests/test-sources/plugins/bufferlines/barbar.nix b/tests/test-sources/plugins/by-name/barbar/default.nix
similarity index 100%
rename from tests/test-sources/plugins/bufferlines/barbar.nix
rename to tests/test-sources/plugins/by-name/barbar/default.nix
diff --git a/tests/test-sources/plugins/bufferlines/barbecue.nix b/tests/test-sources/plugins/by-name/barbecue/default.nix
similarity index 100%
rename from tests/test-sources/plugins/bufferlines/barbecue.nix
rename to tests/test-sources/plugins/by-name/barbecue/default.nix
diff --git a/tests/test-sources/plugins/bufferlines/bufferline.nix b/tests/test-sources/plugins/by-name/bufferline/default.nix
similarity index 100%
rename from tests/test-sources/plugins/bufferlines/bufferline.nix
rename to tests/test-sources/plugins/by-name/bufferline/default.nix
diff --git a/tests/test-sources/plugins/bufferlines/navic.nix b/tests/test-sources/plugins/by-name/navic/default.nix
similarity index 100%
rename from tests/test-sources/plugins/bufferlines/navic.nix
rename to tests/test-sources/plugins/by-name/navic/default.nix