diff --git a/pkgs/tools/admin/azure-cli/0001-optional-immutable-configuration-dir.patch b/pkgs/by-name/az/azure-cli/0001-optional-immutable-configuration-dir.patch
similarity index 100%
rename from pkgs/tools/admin/azure-cli/0001-optional-immutable-configuration-dir.patch
rename to pkgs/by-name/az/azure-cli/0001-optional-immutable-configuration-dir.patch
diff --git a/pkgs/tools/admin/azure-cli/README.md b/pkgs/by-name/az/azure-cli/README.md
similarity index 100%
rename from pkgs/tools/admin/azure-cli/README.md
rename to pkgs/by-name/az/azure-cli/README.md
diff --git a/pkgs/tools/admin/azure-cli/commit-update-hunks.sh b/pkgs/by-name/az/azure-cli/commit-update-hunks.sh
similarity index 100%
rename from pkgs/tools/admin/azure-cli/commit-update-hunks.sh
rename to pkgs/by-name/az/azure-cli/commit-update-hunks.sh
diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix
similarity index 100%
rename from pkgs/tools/admin/azure-cli/extensions-generated.nix
rename to pkgs/by-name/az/azure-cli/extensions-generated.nix
diff --git a/pkgs/tools/admin/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
similarity index 100%
rename from pkgs/tools/admin/azure-cli/extensions-manual.nix
rename to pkgs/by-name/az/azure-cli/extensions-manual.nix
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/by-name/az/azure-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/azure-cli/default.nix
rename to pkgs/by-name/az/azure-cli/package.nix
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix
similarity index 100%
rename from pkgs/tools/admin/azure-cli/python-packages.nix
rename to pkgs/by-name/az/azure-cli/python-packages.nix
diff --git a/pkgs/tools/admin/azure-cli/query-extension-index.sh b/pkgs/by-name/az/azure-cli/query-extension-index.sh
similarity index 100%
rename from pkgs/tools/admin/azure-cli/query-extension-index.sh
rename to pkgs/by-name/az/azure-cli/query-extension-index.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4417e93bbcbe..ae0a48aa7dd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3314,8 +3314,6 @@ with pkgs;
 
   azeret-mono = callPackage ../data/fonts/azeret-mono { };
 
-  azure-cli = callPackage ../tools/admin/azure-cli { };
-
   azure-cli-extensions = recurseIntoAttrs azure-cli.extensions;
 
   azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { };