diff --git a/himmelblaud/wscript_build b/himmelblaud/wscript_build
deleted file mode 100644
index 1916cf64bcb..00000000000
--- a/himmelblaud/wscript_build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_RUST_BINARY('himmelblaud',
-                      source='src/main.rs param/src/lib.rs chelps/src/lib.rs dbg/src/lib.rs ntstatus_gen/src/lib.rs sock/src/lib.rs tdb/src/lib.rs version/src/lib.rs')
-
-bld.RECURSE('nss')
-bld.RECURSE('pam')
diff --git a/himmelblaud/.gitignore b/rust/.gitignore
similarity index 100%
rename from himmelblaud/.gitignore
rename to rust/.gitignore
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
new file mode 100644
index 00000000000..5c9e3107faa
--- /dev/null
+++ b/rust/Cargo.toml
@@ -0,0 +1,23 @@
+[workspace.package]
+edition = "2021"
+license = "GPL-3.0-or-later"
+homepage = "https://www.samba.org/"
+version = "4.21.0"
+
+[workspace]
+resolver = "2"
+members = [
+  "chelps", "dbg", "himmelblaud", "idmap",
+  "nss", "ntstatus_gen", "pam",
+  "param", "sock", "tdb", "version",
+]
+
+[workspace.dependencies]
+param = { path = "param" }
+dbg = { path = "dbg" }
+chelps = { path = "chelps" }
+sock = { path = "sock" }
+ntstatus_gen = { path = "ntstatus_gen" }
+tdb = { path = "tdb" }
+idmap = { path = "idmap" }
+libc = "0.2.155"
diff --git a/himmelblaud/build.rs b/rust/build.rs
similarity index 100%
rename from himmelblaud/build.rs
rename to rust/build.rs
diff --git a/himmelblaud/chelps/Cargo.toml b/rust/chelps/Cargo.toml
similarity index 100%
rename from himmelblaud/chelps/Cargo.toml
rename to rust/chelps/Cargo.toml
diff --git a/himmelblaud/chelps/src/lib.rs b/rust/chelps/src/lib.rs
similarity index 100%
rename from himmelblaud/chelps/src/lib.rs
rename to rust/chelps/src/lib.rs
diff --git a/himmelblaud/dbg/Cargo.toml b/rust/dbg/Cargo.toml
similarity index 100%
rename from himmelblaud/dbg/Cargo.toml
rename to rust/dbg/Cargo.toml
diff --git a/himmelblaud/dbg/build.rs b/rust/dbg/build.rs
similarity index 100%
rename from himmelblaud/dbg/build.rs
rename to rust/dbg/build.rs
diff --git a/himmelblaud/dbg/src/lib.rs b/rust/dbg/src/lib.rs
similarity index 100%
rename from himmelblaud/dbg/src/lib.rs
rename to rust/dbg/src/lib.rs
diff --git a/himmelblaud/Cargo.toml b/rust/himmelblaud/Cargo.toml
similarity index 55%
rename from himmelblaud/Cargo.toml
rename to rust/himmelblaud/Cargo.toml
index 56daa81fbe7..d82ff823949 100644
--- a/himmelblaud/Cargo.toml
+++ b/rust/himmelblaud/Cargo.toml
@@ -1,9 +1,3 @@
-[workspace.package]
-edition = "2021"
-license = "GPL-3.0-or-later"
-homepage = "https://www.samba.org/"
-version = "4.21.0"
-
 [package]
 name = "himmelblaud"
 edition.workspace = true
@@ -31,21 +25,4 @@ idmap = { workspace = true }
 libc = { workspace = true }
 
 [build-dependencies]
-version = { path = "version" }
-
-[workspace]
-members = [
-  "chelps", "dbg", "idmap",
-  "nss", "ntstatus_gen", "pam",
-  "param", "sock", "tdb", "version",
-]
-
-[workspace.dependencies]
-param = { path = "param" }
-dbg = { path = "dbg" }
-chelps = { path = "chelps" }
-sock = { path = "sock" }
-ntstatus_gen = { path = "ntstatus_gen" }
-tdb = { path = "tdb" }
-idmap = { path = "idmap" }
-libc = "0.2.155"
+version = { path = "../version" }
diff --git a/himmelblaud/src/cache.rs b/rust/himmelblaud/src/cache.rs
similarity index 100%
rename from himmelblaud/src/cache.rs
rename to rust/himmelblaud/src/cache.rs
diff --git a/himmelblaud/src/constants.rs b/rust/himmelblaud/src/constants.rs
similarity index 100%
rename from himmelblaud/src/constants.rs
rename to rust/himmelblaud/src/constants.rs
diff --git a/himmelblaud/src/himmelblaud.rs b/rust/himmelblaud/src/himmelblaud.rs
similarity index 100%
rename from himmelblaud/src/himmelblaud.rs
rename to rust/himmelblaud/src/himmelblaud.rs
diff --git a/himmelblaud/src/himmelblaud/himmelblaud_getgrent.rs b/rust/himmelblaud/src/himmelblaud/himmelblaud_getgrent.rs
similarity index 100%
rename from himmelblaud/src/himmelblaud/himmelblaud_getgrent.rs
rename to rust/himmelblaud/src/himmelblaud/himmelblaud_getgrent.rs
diff --git a/himmelblaud/src/himmelblaud/himmelblaud_getgrgid.rs b/rust/himmelblaud/src/himmelblaud/himmelblaud_getgrgid.rs
similarity index 100%
rename from himmelblaud/src/himmelblaud/himmelblaud_getgrgid.rs
rename to rust/himmelblaud/src/himmelblaud/himmelblaud_getgrgid.rs
diff --git a/himmelblaud/src/himmelblaud/himmelblaud_getgrnam.rs b/rust/himmelblaud/src/himmelblaud/himmelblaud_getgrnam.rs
similarity index 100%
rename from himmelblaud/src/himmelblaud/himmelblaud_getgrnam.rs
rename to rust/himmelblaud/src/himmelblaud/himmelblaud_getgrnam.rs
diff --git a/himmelblaud/src/himmelblaud/himmelblaud_getpwent.rs b/rust/himmelblaud/src/himmelblaud/himmelblaud_getpwent.rs
similarity index 100%
rename from himmelblaud/src/himmelblaud/himmelblaud_getpwent.rs
rename to rust/himmelblaud/src/himmelblaud/himmelblaud_getpwent.rs
diff --git a/himmelblaud/src/himmelblaud/himmelblaud_getpwnam.rs b/rust/himmelblaud/src/himmelblaud/himmelblaud_getpwnam.rs
similarity index 100%
rename from himmelblaud/src/himmelblaud/himmelblaud_getpwnam.rs
rename to rust/himmelblaud/src/himmelblaud/himmelblaud_getpwnam.rs
diff --git a/himmelblaud/src/himmelblaud/himmelblaud_getpwuid.rs b/rust/himmelblaud/src/himmelblaud/himmelblaud_getpwuid.rs
similarity index 100%
rename from himmelblaud/src/himmelblaud/himmelblaud_getpwuid.rs
rename to rust/himmelblaud/src/himmelblaud/himmelblaud_getpwuid.rs
diff --git a/himmelblaud/src/himmelblaud/himmelblaud_pam_acct_mgmt.rs b/rust/himmelblaud/src/himmelblaud/himmelblaud_pam_acct_mgmt.rs
similarity index 100%
rename from himmelblaud/src/himmelblaud/himmelblaud_pam_acct_mgmt.rs
rename to rust/himmelblaud/src/himmelblaud/himmelblaud_pam_acct_mgmt.rs
diff --git a/himmelblaud/src/himmelblaud/himmelblaud_pam_auth.rs b/rust/himmelblaud/src/himmelblaud/himmelblaud_pam_auth.rs
similarity index 100%
rename from himmelblaud/src/himmelblaud/himmelblaud_pam_auth.rs
rename to rust/himmelblaud/src/himmelblaud/himmelblaud_pam_auth.rs
diff --git a/himmelblaud/src/main.rs b/rust/himmelblaud/src/main.rs
similarity index 100%
rename from himmelblaud/src/main.rs
rename to rust/himmelblaud/src/main.rs
diff --git a/himmelblaud/src/utils.rs b/rust/himmelblaud/src/utils.rs
similarity index 100%
rename from himmelblaud/src/utils.rs
rename to rust/himmelblaud/src/utils.rs
diff --git a/rust/himmelblaud/wscript_build b/rust/himmelblaud/wscript_build
new file mode 100644
index 00000000000..5997ab0ccfc
--- /dev/null
+++ b/rust/himmelblaud/wscript_build
@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+import os
+
+bld.SAMBA_RUST_BINARY('himmelblaud',
+                      source='src/main.rs ../param/src/lib.rs ../chelps/src/lib.rs ../dbg/src/lib.rs ../ntstatus_gen/src/lib.rs ../sock/src/lib.rs ../tdb/src/lib.rs ../version/src/lib.rs')
diff --git a/himmelblaud/idmap/Cargo.toml b/rust/idmap/Cargo.toml
similarity index 100%
rename from himmelblaud/idmap/Cargo.toml
rename to rust/idmap/Cargo.toml
diff --git a/himmelblaud/idmap/build.rs b/rust/idmap/build.rs
similarity index 100%
rename from himmelblaud/idmap/build.rs
rename to rust/idmap/build.rs
diff --git a/himmelblaud/idmap/src/lib.rs b/rust/idmap/src/lib.rs
similarity index 100%
rename from himmelblaud/idmap/src/lib.rs
rename to rust/idmap/src/lib.rs
diff --git a/himmelblaud/idmap/src/murmurhash3.c b/rust/idmap/src/murmurhash3.c
similarity index 100%
rename from himmelblaud/idmap/src/murmurhash3.c
rename to rust/idmap/src/murmurhash3.c
diff --git a/himmelblaud/idmap/src/murmurhash3.h b/rust/idmap/src/murmurhash3.h
similarity index 100%
rename from himmelblaud/idmap/src/murmurhash3.h
rename to rust/idmap/src/murmurhash3.h
diff --git a/himmelblaud/idmap/src/sss_idmap.c b/rust/idmap/src/sss_idmap.c
similarity index 100%
rename from himmelblaud/idmap/src/sss_idmap.c
rename to rust/idmap/src/sss_idmap.c
diff --git a/himmelblaud/idmap/src/sss_idmap.h b/rust/idmap/src/sss_idmap.h
similarity index 100%
rename from himmelblaud/idmap/src/sss_idmap.h
rename to rust/idmap/src/sss_idmap.h
diff --git a/himmelblaud/idmap/src/sss_idmap_conv.c b/rust/idmap/src/sss_idmap_conv.c
similarity index 100%
rename from himmelblaud/idmap/src/sss_idmap_conv.c
rename to rust/idmap/src/sss_idmap_conv.c
diff --git a/himmelblaud/idmap/src/sss_idmap_private.h b/rust/idmap/src/sss_idmap_private.h
similarity index 100%
rename from himmelblaud/idmap/src/sss_idmap_private.h
rename to rust/idmap/src/sss_idmap_private.h
diff --git a/himmelblaud/idmap/src/util.h b/rust/idmap/src/util.h
similarity index 100%
rename from himmelblaud/idmap/src/util.h
rename to rust/idmap/src/util.h
diff --git a/himmelblaud/nss/Cargo.toml b/rust/nss/Cargo.toml
similarity index 100%
rename from himmelblaud/nss/Cargo.toml
rename to rust/nss/Cargo.toml
diff --git a/himmelblaud/nss/build.rs b/rust/nss/build.rs
similarity index 100%
rename from himmelblaud/nss/build.rs
rename to rust/nss/build.rs
diff --git a/himmelblaud/nss/src/lib.rs b/rust/nss/src/lib.rs
similarity index 100%
rename from himmelblaud/nss/src/lib.rs
rename to rust/nss/src/lib.rs
diff --git a/himmelblaud/nss/wscript_build b/rust/nss/wscript_build
similarity index 100%
rename from himmelblaud/nss/wscript_build
rename to rust/nss/wscript_build
diff --git a/himmelblaud/ntstatus_gen/Cargo.toml b/rust/ntstatus_gen/Cargo.toml
similarity index 100%
rename from himmelblaud/ntstatus_gen/Cargo.toml
rename to rust/ntstatus_gen/Cargo.toml
diff --git a/himmelblaud/ntstatus_gen/src/lib.rs b/rust/ntstatus_gen/src/lib.rs
similarity index 100%
rename from himmelblaud/ntstatus_gen/src/lib.rs
rename to rust/ntstatus_gen/src/lib.rs
diff --git a/himmelblaud/pam/Cargo.toml b/rust/pam/Cargo.toml
similarity index 100%
rename from himmelblaud/pam/Cargo.toml
rename to rust/pam/Cargo.toml
diff --git a/himmelblaud/pam/build.rs b/rust/pam/build.rs
similarity index 100%
rename from himmelblaud/pam/build.rs
rename to rust/pam/build.rs
diff --git a/himmelblaud/pam/src/lib.rs b/rust/pam/src/lib.rs
similarity index 100%
rename from himmelblaud/pam/src/lib.rs
rename to rust/pam/src/lib.rs
diff --git a/himmelblaud/pam/src/pam/constants.rs b/rust/pam/src/pam/constants.rs
similarity index 100%
rename from himmelblaud/pam/src/pam/constants.rs
rename to rust/pam/src/pam/constants.rs
diff --git a/himmelblaud/pam/src/pam/conv.rs b/rust/pam/src/pam/conv.rs
similarity index 100%
rename from himmelblaud/pam/src/pam/conv.rs
rename to rust/pam/src/pam/conv.rs
diff --git a/himmelblaud/pam/src/pam/items.rs b/rust/pam/src/pam/items.rs
similarity index 100%
rename from himmelblaud/pam/src/pam/items.rs
rename to rust/pam/src/pam/items.rs
diff --git a/himmelblaud/pam/src/pam/macros.rs b/rust/pam/src/pam/macros.rs
similarity index 100%
rename from himmelblaud/pam/src/pam/macros.rs
rename to rust/pam/src/pam/macros.rs
diff --git a/himmelblaud/pam/src/pam/mod.rs b/rust/pam/src/pam/mod.rs
similarity index 100%
rename from himmelblaud/pam/src/pam/mod.rs
rename to rust/pam/src/pam/mod.rs
diff --git a/himmelblaud/pam/src/pam/module.rs b/rust/pam/src/pam/module.rs
similarity index 100%
rename from himmelblaud/pam/src/pam/module.rs
rename to rust/pam/src/pam/module.rs
diff --git a/himmelblaud/pam/wscript_build b/rust/pam/wscript_build
similarity index 100%
rename from himmelblaud/pam/wscript_build
rename to rust/pam/wscript_build
diff --git a/himmelblaud/param/Cargo.toml b/rust/param/Cargo.toml
similarity index 100%
rename from himmelblaud/param/Cargo.toml
rename to rust/param/Cargo.toml
diff --git a/himmelblaud/param/build.rs b/rust/param/build.rs
similarity index 100%
rename from himmelblaud/param/build.rs
rename to rust/param/build.rs
diff --git a/himmelblaud/param/src/lib.rs b/rust/param/src/lib.rs
similarity index 100%
rename from himmelblaud/param/src/lib.rs
rename to rust/param/src/lib.rs
diff --git a/himmelblaud/rustfmt.toml b/rust/rustfmt.toml
similarity index 100%
rename from himmelblaud/rustfmt.toml
rename to rust/rustfmt.toml
diff --git a/himmelblaud/sock/Cargo.toml b/rust/sock/Cargo.toml
similarity index 100%
rename from himmelblaud/sock/Cargo.toml
rename to rust/sock/Cargo.toml
diff --git a/himmelblaud/sock/src/lib.rs b/rust/sock/src/lib.rs
similarity index 100%
rename from himmelblaud/sock/src/lib.rs
rename to rust/sock/src/lib.rs
diff --git a/himmelblaud/sock/src/proto.rs b/rust/sock/src/proto.rs
similarity index 100%
rename from himmelblaud/sock/src/proto.rs
rename to rust/sock/src/proto.rs
diff --git a/himmelblaud/tdb/Cargo.toml b/rust/tdb/Cargo.toml
similarity index 100%
rename from himmelblaud/tdb/Cargo.toml
rename to rust/tdb/Cargo.toml
diff --git a/himmelblaud/tdb/build.rs b/rust/tdb/build.rs
similarity index 100%
rename from himmelblaud/tdb/build.rs
rename to rust/tdb/build.rs
diff --git a/himmelblaud/tdb/src/lib.rs b/rust/tdb/src/lib.rs
similarity index 100%
rename from himmelblaud/tdb/src/lib.rs
rename to rust/tdb/src/lib.rs
diff --git a/himmelblaud/version/Cargo.toml b/rust/version/Cargo.toml
similarity index 100%
rename from himmelblaud/version/Cargo.toml
rename to rust/version/Cargo.toml
diff --git a/himmelblaud/version/build.rs b/rust/version/build.rs
similarity index 100%
rename from himmelblaud/version/build.rs
rename to rust/version/build.rs
diff --git a/himmelblaud/version/include/includes.h b/rust/version/include/includes.h
similarity index 100%
rename from himmelblaud/version/include/includes.h
rename to rust/version/include/includes.h
diff --git a/himmelblaud/version/src/lib.rs b/rust/version/src/lib.rs
similarity index 100%
rename from himmelblaud/version/src/lib.rs
rename to rust/version/src/lib.rs
diff --git a/rust/wscript_build b/rust/wscript_build
new file mode 100644
index 00000000000..f9528e57a52
--- /dev/null
+++ b/rust/wscript_build
@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+bld.RECURSE('himmelblaud')
+bld.RECURSE('nss')
+bld.RECURSE('pam')
diff --git a/wscript_build b/wscript_build
index d2b10a45134..b4b115e6ad2 100644
--- a/wscript_build
+++ b/wscript_build
@@ -155,7 +155,7 @@ bld.RECURSE('dfs_server')
 bld.RECURSE('file_server')
 bld.RECURSE('lib/krb5_wrap')
 bld.RECURSE('packaging')
-bld.RECURSE('himmelblaud')
+bld.RECURSE('rust')
 
 bld.RECURSE('testsuite/headers')