diff --git a/pkgs/desktops/arcan/arcan.nix b/pkgs/desktops/arcan/arcan/default.nix
similarity index 100%
rename from pkgs/desktops/arcan/arcan.nix
rename to pkgs/desktops/arcan/arcan/default.nix
diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix
index 39d3e489c592..9d9f28a79538 100644
--- a/pkgs/desktops/arcan/default.nix
+++ b/pkgs/desktops/arcan/default.nix
@@ -9,25 +9,26 @@ rec {
 
   # Arcan
 
-  arcan = callPackage ./arcan.nix { };
+  arcan = callPackage ./arcan { };
   arcan-wrapped = callPackage ./wrapper.nix { };
-  xarcan = callPackage ./xarcan.nix { };
+  xarcan = callPackage ./xarcan { };
 
   # Appls
 
-  durden = callPackage ./durden.nix { };
+  durden = callPackage ./durden { };
   durden-wrapped = callPackage ./wrapper.nix {
     name = "durden-wrapped";
     appls = [ durden ];
   };
 
-  pipeworld = callPackage ./pipeworld.nix { };
+  pipeworld = callPackage ./pipeworld { };
   pipeworld-wrapped = callPackage ./wrapper.nix {
     name = "pipeworld-wrapped";
     appls = [ pipeworld ];
   };
 
-  prio = callPackage ./prio.nix { };
+  # Warning: prio is deprecated; however it works and is useful for testing
+  prio = callPackage ./prio { };
   prio-wrapped = callPackage ./wrapper.nix {
     name = "prio-wrapped";
     appls = [ prio ];
diff --git a/pkgs/desktops/arcan/durden.nix b/pkgs/desktops/arcan/durden/default.nix
similarity index 100%
rename from pkgs/desktops/arcan/durden.nix
rename to pkgs/desktops/arcan/durden/default.nix
diff --git a/pkgs/desktops/arcan/pipeworld.nix b/pkgs/desktops/arcan/pipeworld/default.nix
similarity index 100%
rename from pkgs/desktops/arcan/pipeworld.nix
rename to pkgs/desktops/arcan/pipeworld/default.nix
diff --git a/pkgs/desktops/arcan/prio.nix b/pkgs/desktops/arcan/prio/default.nix
similarity index 100%
rename from pkgs/desktops/arcan/prio.nix
rename to pkgs/desktops/arcan/prio/default.nix
diff --git a/pkgs/desktops/arcan/xarcan.nix b/pkgs/desktops/arcan/xarcan/default.nix
similarity index 100%
rename from pkgs/desktops/arcan/xarcan.nix
rename to pkgs/desktops/arcan/xarcan/default.nix