diff --git a/pkgs/tools/system/colorls/Gemfile b/pkgs/by-name/co/colorls/Gemfile
similarity index 100%
rename from pkgs/tools/system/colorls/Gemfile
rename to pkgs/by-name/co/colorls/Gemfile
diff --git a/pkgs/tools/system/colorls/Gemfile.lock b/pkgs/by-name/co/colorls/Gemfile.lock
similarity index 100%
rename from pkgs/tools/system/colorls/Gemfile.lock
rename to pkgs/by-name/co/colorls/Gemfile.lock
diff --git a/pkgs/tools/system/colorls/gemset.nix b/pkgs/by-name/co/colorls/gemset.nix
similarity index 100%
rename from pkgs/tools/system/colorls/gemset.nix
rename to pkgs/by-name/co/colorls/gemset.nix
diff --git a/pkgs/tools/system/colorls/default.nix b/pkgs/by-name/co/colorls/package.nix
similarity index 100%
rename from pkgs/tools/system/colorls/default.nix
rename to pkgs/by-name/co/colorls/package.nix
diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile b/pkgs/by-name/hi/hiera-eyaml/Gemfile
similarity index 100%
rename from pkgs/tools/system/hiera-eyaml/Gemfile
rename to pkgs/by-name/hi/hiera-eyaml/Gemfile
diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile.lock b/pkgs/by-name/hi/hiera-eyaml/Gemfile.lock
similarity index 100%
rename from pkgs/tools/system/hiera-eyaml/Gemfile.lock
rename to pkgs/by-name/hi/hiera-eyaml/Gemfile.lock
diff --git a/pkgs/tools/system/hiera-eyaml/gemset.nix b/pkgs/by-name/hi/hiera-eyaml/gemset.nix
similarity index 100%
rename from pkgs/tools/system/hiera-eyaml/gemset.nix
rename to pkgs/by-name/hi/hiera-eyaml/gemset.nix
diff --git a/pkgs/tools/system/hiera-eyaml/default.nix b/pkgs/by-name/hi/hiera-eyaml/package.nix
similarity index 100%
rename from pkgs/tools/system/hiera-eyaml/default.nix
rename to pkgs/by-name/hi/hiera-eyaml/package.nix
diff --git a/pkgs/tools/system/procodile/Gemfile b/pkgs/by-name/pr/procodile/Gemfile
similarity index 100%
rename from pkgs/tools/system/procodile/Gemfile
rename to pkgs/by-name/pr/procodile/Gemfile
diff --git a/pkgs/tools/system/procodile/Gemfile.lock b/pkgs/by-name/pr/procodile/Gemfile.lock
similarity index 100%
rename from pkgs/tools/system/procodile/Gemfile.lock
rename to pkgs/by-name/pr/procodile/Gemfile.lock
diff --git a/pkgs/tools/system/procodile/gemset.nix b/pkgs/by-name/pr/procodile/gemset.nix
similarity index 100%
rename from pkgs/tools/system/procodile/gemset.nix
rename to pkgs/by-name/pr/procodile/gemset.nix
diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/by-name/pr/procodile/package.nix
similarity index 100%
rename from pkgs/tools/system/procodile/default.nix
rename to pkgs/by-name/pr/procodile/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4402029d4d5..e37e58d6086c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2058,8 +2058,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation AddressBook;
   };
 
-  colorls = callPackage ../tools/system/colorls { };
-
   coloursum = callPackage ../tools/text/coloursum {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -3509,8 +3507,6 @@ with pkgs;
     buildGoModule = buildGo123Module;
   };
 
-  hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
-
   hobbits = libsForQt5.callPackage ../tools/graphics/hobbits { };
 
   highlight = callPackage ../tools/text/highlight {
@@ -7919,8 +7915,6 @@ with pkgs;
 
   premake = premake4;
 
-  procodile = callPackage ../tools/system/procodile { };
-
   pry = callPackage ../development/tools/pry { };
 
   pycritty = with python3Packages; toPythonApplication pycritty;