diff --git a/plugins/dap/dap-go.nix b/plugins/by-name/dap/dap-go.nix
similarity index 100%
rename from plugins/dap/dap-go.nix
rename to plugins/by-name/dap/dap-go.nix
diff --git a/plugins/dap/dap-python.nix b/plugins/by-name/dap/dap-python.nix
similarity index 100%
rename from plugins/dap/dap-python.nix
rename to plugins/by-name/dap/dap-python.nix
diff --git a/plugins/dap/dap-ui.nix b/plugins/by-name/dap/dap-ui.nix
similarity index 100%
rename from plugins/dap/dap-ui.nix
rename to plugins/by-name/dap/dap-ui.nix
diff --git a/plugins/dap/dap-virtual-text.nix b/plugins/by-name/dap/dap-virtual-text.nix
similarity index 100%
rename from plugins/dap/dap-virtual-text.nix
rename to plugins/by-name/dap/dap-virtual-text.nix
diff --git a/plugins/dap/dapHelpers.nix b/plugins/by-name/dap/dapHelpers.nix
similarity index 100%
rename from plugins/dap/dapHelpers.nix
rename to plugins/by-name/dap/dapHelpers.nix
diff --git a/plugins/dap/default.nix b/plugins/by-name/dap/default.nix
similarity index 100%
rename from plugins/dap/default.nix
rename to plugins/by-name/dap/default.nix
diff --git a/plugins/default.nix b/plugins/default.nix
index ee998355..befcdf99 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -39,8 +39,6 @@
     ./completion/lspkind.nix
     ./completion/cmp
 
-    ./dap
-
     ./filetrees/chadtree.nix
     ./filetrees/neo-tree.nix
     ./filetrees/nvim-tree.nix
diff --git a/tests/test-sources/plugins/dap/dap-go.nix b/tests/test-sources/plugins/by-name/dap/dap-go.nix
similarity index 100%
rename from tests/test-sources/plugins/dap/dap-go.nix
rename to tests/test-sources/plugins/by-name/dap/dap-go.nix
diff --git a/tests/test-sources/plugins/dap/dap-python.nix b/tests/test-sources/plugins/by-name/dap/dap-python.nix
similarity index 100%
rename from tests/test-sources/plugins/dap/dap-python.nix
rename to tests/test-sources/plugins/by-name/dap/dap-python.nix
diff --git a/tests/test-sources/plugins/dap/dap-ui.nix b/tests/test-sources/plugins/by-name/dap/dap-ui.nix
similarity index 100%
rename from tests/test-sources/plugins/dap/dap-ui.nix
rename to tests/test-sources/plugins/by-name/dap/dap-ui.nix
diff --git a/tests/test-sources/plugins/dap/dap-virtual-text.nix b/tests/test-sources/plugins/by-name/dap/dap-virtual-text.nix
similarity index 100%
rename from tests/test-sources/plugins/dap/dap-virtual-text.nix
rename to tests/test-sources/plugins/by-name/dap/dap-virtual-text.nix
diff --git a/tests/test-sources/plugins/dap/_dap.nix b/tests/test-sources/plugins/by-name/dap/default.nix
similarity index 100%
rename from tests/test-sources/plugins/dap/_dap.nix
rename to tests/test-sources/plugins/by-name/dap/default.nix