diff --git a/pkgs/applications/science/electronics/kicad/addons/kikit.nix b/pkgs/by-name/ki/kicad/addons/kikit.nix
similarity index 100%
rename from pkgs/applications/science/electronics/kicad/addons/kikit.nix
rename to pkgs/by-name/ki/kicad/addons/kikit.nix
diff --git a/pkgs/applications/science/electronics/kicad/addons/default.nix b/pkgs/by-name/ki/kicad/addons/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/kicad/addons/default.nix
rename to pkgs/by-name/ki/kicad/addons/package.nix
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/by-name/ki/kicad/base.nix
similarity index 100%
rename from pkgs/applications/science/electronics/kicad/base.nix
rename to pkgs/by-name/ki/kicad/base.nix
diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/by-name/ki/kicad/libraries.nix
similarity index 100%
rename from pkgs/applications/science/electronics/kicad/libraries.nix
rename to pkgs/by-name/ki/kicad/libraries.nix
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/by-name/ki/kicad/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/kicad/default.nix
rename to pkgs/by-name/ki/kicad/package.nix
diff --git a/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch b/pkgs/by-name/ki/kicad/runtime_stock_data_path.patch
similarity index 100%
rename from pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch
rename to pkgs/by-name/ki/kicad/runtime_stock_data_path.patch
diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/by-name/ki/kicad/update.sh
similarity index 100%
rename from pkgs/applications/science/electronics/kicad/update.sh
rename to pkgs/by-name/ki/kicad/update.sh
diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/by-name/ki/kicad/versions.nix
similarity index 100%
rename from pkgs/applications/science/electronics/kicad/versions.nix
rename to pkgs/by-name/ki/kicad/versions.nix
diff --git a/pkgs/applications/science/electronics/kicad/writable.patch b/pkgs/by-name/ki/kicad/writable.patch
similarity index 100%
rename from pkgs/applications/science/electronics/kicad/writable.patch
rename to pkgs/by-name/ki/kicad/writable.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1566cd682797..2dd368698e9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13553,8 +13553,6 @@ with pkgs;
     cairo = cairo.override { x11Support = true; };
   };
 
-  # this is a wrapper for kicad.base and kicad.libraries
-  kicad = callPackage ../applications/science/electronics/kicad { };
   # this is the same but without the (sizable) 3D models library
   kicad-small = kicad.override {
     pname = "kicad-small";
@@ -13583,7 +13581,7 @@ with pkgs;
     with3d = false;
   };
 
-  kicadAddons = recurseIntoAttrs (callPackage ../applications/science/electronics/kicad/addons { });
+  kicadAddons = recurseIntoAttrs (callPackage ../by-name/ki/kicad/addons/package.nix { });
 
   librepcb = qt6Packages.callPackage ../applications/science/electronics/librepcb { };