diff --git a/pkgs/build-support/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
similarity index 100%
rename from pkgs/build-support/build-dotnet-module/default.nix
rename to pkgs/build-support/dotnet/build-dotnet-module/default.nix
diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/dotnet/build-dotnet-package/default.nix
similarity index 100%
rename from pkgs/build-support/build-dotnet-package/default.nix
rename to pkgs/build-support/dotnet/build-dotnet-package/default.nix
diff --git a/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh
similarity index 100%
rename from pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh
rename to pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh
diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix
similarity index 100%
rename from pkgs/build-support/dotnetbuildhelpers/default.nix
rename to pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix
diff --git a/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh
similarity index 100%
rename from pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh
rename to pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh
diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh
similarity index 100%
rename from pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh
rename to pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh
diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh
similarity index 100%
rename from pkgs/build-support/dotnetbuildhelpers/placate-paket.sh
rename to pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh
diff --git a/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh
similarity index 100%
rename from pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh
rename to pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper.sln
similarity index 100%
rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln
rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper.sln
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs
similarity index 100%
rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs
rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
similarity index 100%
rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in
similarity index 100%
rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in
rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in
diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnet/dotnetenv/build-solution.nix
similarity index 100%
rename from pkgs/build-support/dotnetenv/build-solution.nix
rename to pkgs/build-support/dotnet/dotnetenv/build-solution.nix
diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnet/dotnetenv/default.nix
similarity index 100%
rename from pkgs/build-support/dotnetenv/default.nix
rename to pkgs/build-support/dotnet/dotnetenv/default.nix
diff --git a/pkgs/build-support/dotnetenv/wrapper.nix b/pkgs/build-support/dotnet/dotnetenv/wrapper.nix
similarity index 100%
rename from pkgs/build-support/dotnetenv/wrapper.nix
rename to pkgs/build-support/dotnet/dotnetenv/wrapper.nix
diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/dotnet/fetchnuget/default.nix
similarity index 100%
rename from pkgs/build-support/fetchnuget/default.nix
rename to pkgs/build-support/dotnet/fetchnuget/default.nix
diff --git a/pkgs/build-support/nuget-to-nix/default.nix b/pkgs/build-support/dotnet/nuget-to-nix/default.nix
similarity index 100%
rename from pkgs/build-support/nuget-to-nix/default.nix
rename to pkgs/build-support/dotnet/nuget-to-nix/default.nix
diff --git a/pkgs/build-support/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
similarity index 100%
rename from pkgs/build-support/nuget-to-nix/nuget-to-nix.sh
rename to pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f30ef8dcf825..c06416105e0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -437,11 +437,7 @@ with pkgs;
 
   dotfiles = callPackage ../applications/misc/dotfiles { };
 
-  dotnetenv = callPackage ../build-support/dotnetenv {
-    dotnetfx = dotnetfx40;
-  };
-
-  dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { };
+  # Dotnet
 
   dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {});
 
@@ -454,6 +450,17 @@ with pkgs;
   dotnet-runtime = dotnetCorePackages.runtime_6_0;
   dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0;
 
+  buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { };
+  nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { };
+
+  dotnetenv = callPackage ../build-support/dotnet/dotnetenv {
+    dotnetfx = dotnetfx40;
+  };
+
+  buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { };
+  fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { };
+  dotnetbuildhelpers = callPackage ../build-support/dotnet/dotnetbuildhelpers { };
+
   dumb-init = callPackage ../applications/virtualization/dumb-init {};
 
   umoci = callPackage ../applications/virtualization/umoci {};
@@ -655,11 +662,6 @@ with pkgs;
 
   fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {};
 
-  fetchNuGet = callPackage ../build-support/fetchnuget { };
-  buildDotnetPackage = callPackage ../build-support/build-dotnet-package { };
-  buildDotnetModule = callPackage ../build-support/build-dotnet-module { };
-  nuget-to-nix = callPackage ../build-support/nuget-to-nix { };
-
   fetchgx = callPackage ../build-support/fetchgx { };
 
   resolveMirrorURLs = {url}: fetchurl {