diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/git-and-tools/josh/default.nix
similarity index 100%
rename from pkgs/applications/version-management/josh/default.nix
rename to pkgs/applications/version-management/git-and-tools/josh/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b47f3153b8d7..7f30247a59c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1853,7 +1853,7 @@ with pkgs;
 
   hut = callPackage ../applications/version-management/git-and-tools/hut { };
 
-  josh = callPackage ../applications/version-management/josh { };
+  josh = callPackage ../applications/version-management/git-and-tools/josh { };
 
   lab = callPackage ../applications/version-management/git-and-tools/lab { };