diff --git a/plugins/ui/edgy.nix b/plugins/by-name/edgy/default.nix
similarity index 100%
rename from plugins/ui/edgy.nix
rename to plugins/by-name/edgy/default.nix
diff --git a/plugins/ui/headlines.nix b/plugins/by-name/headlines/default.nix
similarity index 100%
rename from plugins/ui/headlines.nix
rename to plugins/by-name/headlines/default.nix
diff --git a/plugins/ui/image.nix b/plugins/by-name/image/default.nix
similarity index 100%
rename from plugins/ui/image.nix
rename to plugins/by-name/image/default.nix
diff --git a/plugins/ui/neoscroll.nix b/plugins/by-name/neoscroll/default.nix
similarity index 100%
rename from plugins/ui/neoscroll.nix
rename to plugins/by-name/neoscroll/default.nix
diff --git a/plugins/ui/noice.nix b/plugins/by-name/noice/default.nix
similarity index 100%
rename from plugins/ui/noice.nix
rename to plugins/by-name/noice/default.nix
diff --git a/plugins/ui/numbertoggle.nix b/plugins/by-name/numbertoggle/default.nix
similarity index 100%
rename from plugins/ui/numbertoggle.nix
rename to plugins/by-name/numbertoggle/default.nix
diff --git a/plugins/ui/specs.nix b/plugins/by-name/specs/default.nix
similarity index 100%
rename from plugins/ui/specs.nix
rename to plugins/by-name/specs/default.nix
diff --git a/plugins/ui/statuscol.nix b/plugins/by-name/statuscol/default.nix
similarity index 100%
rename from plugins/ui/statuscol.nix
rename to plugins/by-name/statuscol/default.nix
diff --git a/plugins/ui/transparent.nix b/plugins/by-name/transparent/default.nix
similarity index 100%
rename from plugins/ui/transparent.nix
rename to plugins/by-name/transparent/default.nix
diff --git a/plugins/ui/twilight.nix b/plugins/by-name/twilight/default.nix
similarity index 100%
rename from plugins/ui/twilight.nix
rename to plugins/by-name/twilight/default.nix
diff --git a/plugins/ui/virt-column.nix b/plugins/by-name/virt-column/default.nix
similarity index 100%
rename from plugins/ui/virt-column.nix
rename to plugins/by-name/virt-column/default.nix
diff --git a/plugins/ui/zen-mode.nix b/plugins/by-name/zen-mode/default.nix
similarity index 100%
rename from plugins/ui/zen-mode.nix
rename to plugins/by-name/zen-mode/default.nix
diff --git a/plugins/default.nix b/plugins/default.nix
index ab7b6e22..e40550ec 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -130,19 +130,6 @@
 
     ./telescope
 
-    ./ui/edgy.nix
-    ./ui/headlines.nix
-    ./ui/image.nix
-    ./ui/neoscroll.nix
-    ./ui/noice.nix
-    ./ui/numbertoggle.nix
-    ./ui/specs.nix
-    ./ui/statuscol.nix
-    ./ui/transparent.nix
-    ./ui/twilight.nix
-    ./ui/virt-column.nix
-    ./ui/zen-mode.nix
-
     ./deprecation.nix
   ];
 }
diff --git a/tests/test-sources/plugins/ui/edgy.nix b/tests/test-sources/plugins/by-name/edgy/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/edgy.nix
rename to tests/test-sources/plugins/by-name/edgy/default.nix
diff --git a/tests/test-sources/plugins/ui/headlines.nix b/tests/test-sources/plugins/by-name/headlines/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/headlines.nix
rename to tests/test-sources/plugins/by-name/headlines/default.nix
diff --git a/tests/test-sources/plugins/ui/image.nix b/tests/test-sources/plugins/by-name/image/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/image.nix
rename to tests/test-sources/plugins/by-name/image/default.nix
diff --git a/tests/test-sources/plugins/ui/neoscroll.nix b/tests/test-sources/plugins/by-name/neoscroll/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/neoscroll.nix
rename to tests/test-sources/plugins/by-name/neoscroll/default.nix
diff --git a/tests/test-sources/plugins/ui/noice.nix b/tests/test-sources/plugins/by-name/noice/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/noice.nix
rename to tests/test-sources/plugins/by-name/noice/default.nix
diff --git a/tests/test-sources/plugins/ui/numbertoggle.nix b/tests/test-sources/plugins/by-name/numbertoggle/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/numbertoggle.nix
rename to tests/test-sources/plugins/by-name/numbertoggle/default.nix
diff --git a/tests/test-sources/plugins/ui/specs.nix b/tests/test-sources/plugins/by-name/specs/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/specs.nix
rename to tests/test-sources/plugins/by-name/specs/default.nix
diff --git a/tests/test-sources/plugins/ui/statuscol.nix b/tests/test-sources/plugins/by-name/statuscol/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/statuscol.nix
rename to tests/test-sources/plugins/by-name/statuscol/default.nix
diff --git a/tests/test-sources/plugins/ui/transparent.nix b/tests/test-sources/plugins/by-name/transparent/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/transparent.nix
rename to tests/test-sources/plugins/by-name/transparent/default.nix
diff --git a/tests/test-sources/plugins/ui/twilight.nix b/tests/test-sources/plugins/by-name/twilight/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/twilight.nix
rename to tests/test-sources/plugins/by-name/twilight/default.nix
diff --git a/tests/test-sources/plugins/ui/virt-column.nix b/tests/test-sources/plugins/by-name/virt-column/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/virt-column.nix
rename to tests/test-sources/plugins/by-name/virt-column/default.nix
diff --git a/tests/test-sources/plugins/ui/zen-mode.nix b/tests/test-sources/plugins/by-name/zen-mode/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/zen-mode.nix
rename to tests/test-sources/plugins/by-name/zen-mode/default.nix