diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix
similarity index 100%
rename from pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix
rename to pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/by-name/wi/windowmaker/dockapps/default.nix
similarity index 100%
rename from pkgs/applications/window-managers/windowmaker/dockapps/default.nix
rename to pkgs/by-name/wi/windowmaker/dockapps/default.nix
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
similarity index 100%
rename from pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix
rename to pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix
similarity index 100%
rename from pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix
rename to pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix
similarity index 100%
rename from pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix
rename to pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix
similarity index 100%
rename from pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
rename to pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/by-name/wi/windowmaker/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/windowmaker/default.nix
rename to pkgs/by-name/wi/windowmaker/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54f20727d888..bf490600431b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36670,8 +36670,7 @@ with pkgs;
 
   windowlab = callPackage ../applications/window-managers/windowlab { };
 
-  windowmaker = callPackage ../applications/window-managers/windowmaker { };
-  dockapps = callPackage ../applications/window-managers/windowmaker/dockapps { };
+  dockapps = callPackage ../by-name/wi/windowmaker/dockapps { };
 
   wily = callPackage ../applications/editors/wily { };