diff --git a/rust-bindings/rust/.ci/generate-test-jobs.sh b/rust-bindings/.ci/generate-test-jobs.sh
similarity index 100%
rename from rust-bindings/rust/.ci/generate-test-jobs.sh
rename to rust-bindings/.ci/generate-test-jobs.sh
diff --git a/rust-bindings/rust/.ci/gitlab-ci-base.yml b/rust-bindings/.ci/gitlab-ci-base.yml
similarity index 100%
rename from rust-bindings/rust/.ci/gitlab-ci-base.yml
rename to rust-bindings/.ci/gitlab-ci-base.yml
diff --git a/rust-bindings/rust/.github/workflows/rust.yml b/rust-bindings/.github/workflows/rust.yml
similarity index 100%
rename from rust-bindings/rust/.github/workflows/rust.yml
rename to rust-bindings/.github/workflows/rust.yml
diff --git a/rust-bindings/rust/.gitignore b/rust-bindings/.gitignore
similarity index 100%
rename from rust-bindings/rust/.gitignore
rename to rust-bindings/.gitignore
diff --git a/rust-bindings/rust/.gitlab-ci.yml b/rust-bindings/.gitlab-ci.yml
similarity index 100%
rename from rust-bindings/rust/.gitlab-ci.yml
rename to rust-bindings/.gitlab-ci.yml
diff --git a/rust-bindings/rust/Cargo.toml b/rust-bindings/Cargo.toml
similarity index 96%
rename from rust-bindings/rust/Cargo.toml
rename to rust-bindings/Cargo.toml
index c5f0b1b0..bb245ed8 100644
--- a/rust-bindings/rust/Cargo.toml
+++ b/rust-bindings/Cargo.toml
@@ -31,7 +31,7 @@ members = [".", "sys"]
 bitflags = "1.2.1"
 cap-std = { version = "0.24", optional = true}
 io-lifetimes = { version = "0.5", optional = true}
-ffi = { package = "ostree-sys", path = "sys", version = "0.9.1" }
+ffi = { package = "ostree-sys", path = "sys", version = "0.9.2" }
 gio = "0.14"
 glib = "0.14.4"
 hex = "0.4.2"
@@ -91,3 +91,4 @@ v2021_2 = ["v2021_1", "ffi/v2021_2"]
 v2021_3 = ["v2021_2", "ffi/v2021_3"]
 v2021_4 = ["v2021_3", "ffi/v2021_4"]
 v2021_5 = ["v2021_4", "ffi/v2021_5"]
+v2022_2 = ["v2021_5", "ffi/v2022_2"]
diff --git a/rust-bindings/rust/Dockerfile b/rust-bindings/Dockerfile
similarity index 100%
rename from rust-bindings/rust/Dockerfile
rename to rust-bindings/Dockerfile
diff --git a/rust-bindings/rust/LICENSE b/rust-bindings/LICENSE
similarity index 100%
rename from rust-bindings/rust/LICENSE
rename to rust-bindings/LICENSE
diff --git a/rust-bindings/rust/LICENSE.LGPL2 b/rust-bindings/LICENSE.LGPL2
similarity index 100%
rename from rust-bindings/rust/LICENSE.LGPL2
rename to rust-bindings/LICENSE.LGPL2
diff --git a/rust-bindings/rust/LICENSE.LGPL2.1 b/rust-bindings/LICENSE.LGPL2.1
similarity index 100%
rename from rust-bindings/rust/LICENSE.LGPL2.1
rename to rust-bindings/LICENSE.LGPL2.1
diff --git a/rust-bindings/rust/Makefile b/rust-bindings/Makefile
similarity index 100%
rename from rust-bindings/rust/Makefile
rename to rust-bindings/Makefile
diff --git a/rust-bindings/rust/README.md b/rust-bindings/README.md
similarity index 100%
rename from rust-bindings/rust/README.md
rename to rust-bindings/README.md
diff --git a/rust-bindings/rust/Vagrantfile b/rust-bindings/Vagrantfile
similarity index 100%
rename from rust-bindings/rust/Vagrantfile
rename to rust-bindings/Vagrantfile
diff --git a/rust-bindings/rust/conf/ostree-sys.toml b/rust-bindings/conf/ostree-sys.toml
similarity index 100%
rename from rust-bindings/rust/conf/ostree-sys.toml
rename to rust-bindings/conf/ostree-sys.toml
diff --git a/rust-bindings/rust/conf/ostree.toml b/rust-bindings/conf/ostree.toml
similarity index 100%
rename from rust-bindings/rust/conf/ostree.toml
rename to rust-bindings/conf/ostree.toml
diff --git a/rust-bindings/rust/gir-files/GLib-2.0.gir b/rust-bindings/gir-files/GLib-2.0.gir
similarity index 100%
rename from rust-bindings/rust/gir-files/GLib-2.0.gir
rename to rust-bindings/gir-files/GLib-2.0.gir
diff --git a/rust-bindings/rust/gir-files/GObject-2.0.gir b/rust-bindings/gir-files/GObject-2.0.gir
similarity index 100%
rename from rust-bindings/rust/gir-files/GObject-2.0.gir
rename to rust-bindings/gir-files/GObject-2.0.gir
diff --git a/rust-bindings/rust/gir-files/Gio-2.0.gir b/rust-bindings/gir-files/Gio-2.0.gir
similarity index 100%
rename from rust-bindings/rust/gir-files/Gio-2.0.gir
rename to rust-bindings/gir-files/Gio-2.0.gir
diff --git a/rust-bindings/rust/gir-files/OSTree-1.0.gir b/rust-bindings/gir-files/OSTree-1.0.gir
similarity index 100%
rename from rust-bindings/rust/gir-files/OSTree-1.0.gir
rename to rust-bindings/gir-files/OSTree-1.0.gir
diff --git a/rust-bindings/rust/src/.gitattributes b/rust-bindings/src/.gitattributes
similarity index 100%
rename from rust-bindings/rust/src/.gitattributes
rename to rust-bindings/src/.gitattributes
diff --git a/rust-bindings/rust/src/auto/async_progress.rs b/rust-bindings/src/auto/async_progress.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/async_progress.rs
rename to rust-bindings/src/auto/async_progress.rs
diff --git a/rust-bindings/rust/src/auto/bootconfig_parser.rs b/rust-bindings/src/auto/bootconfig_parser.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/bootconfig_parser.rs
rename to rust-bindings/src/auto/bootconfig_parser.rs
diff --git a/rust-bindings/rust/src/auto/collection_ref.rs b/rust-bindings/src/auto/collection_ref.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/collection_ref.rs
rename to rust-bindings/src/auto/collection_ref.rs
diff --git a/rust-bindings/rust/src/auto/commit_sizes_entry.rs b/rust-bindings/src/auto/commit_sizes_entry.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/commit_sizes_entry.rs
rename to rust-bindings/src/auto/commit_sizes_entry.rs
diff --git a/rust-bindings/rust/src/auto/constants.rs b/rust-bindings/src/auto/constants.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/constants.rs
rename to rust-bindings/src/auto/constants.rs
diff --git a/rust-bindings/rust/src/auto/content_writer.rs b/rust-bindings/src/auto/content_writer.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/content_writer.rs
rename to rust-bindings/src/auto/content_writer.rs
diff --git a/rust-bindings/rust/src/auto/deployment.rs b/rust-bindings/src/auto/deployment.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/deployment.rs
rename to rust-bindings/src/auto/deployment.rs
diff --git a/rust-bindings/rust/src/auto/diff_item.rs b/rust-bindings/src/auto/diff_item.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/diff_item.rs
rename to rust-bindings/src/auto/diff_item.rs
diff --git a/rust-bindings/rust/src/auto/enums.rs b/rust-bindings/src/auto/enums.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/enums.rs
rename to rust-bindings/src/auto/enums.rs
diff --git a/rust-bindings/rust/src/auto/flags.rs b/rust-bindings/src/auto/flags.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/flags.rs
rename to rust-bindings/src/auto/flags.rs
diff --git a/rust-bindings/rust/src/auto/functions.rs b/rust-bindings/src/auto/functions.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/functions.rs
rename to rust-bindings/src/auto/functions.rs
diff --git a/rust-bindings/rust/src/auto/gpg_verify_result.rs b/rust-bindings/src/auto/gpg_verify_result.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/gpg_verify_result.rs
rename to rust-bindings/src/auto/gpg_verify_result.rs
diff --git a/rust-bindings/rust/src/auto/mod.rs b/rust-bindings/src/auto/mod.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/mod.rs
rename to rust-bindings/src/auto/mod.rs
diff --git a/rust-bindings/rust/src/auto/mutable_tree.rs b/rust-bindings/src/auto/mutable_tree.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/mutable_tree.rs
rename to rust-bindings/src/auto/mutable_tree.rs
diff --git a/rust-bindings/rust/src/auto/remote.rs b/rust-bindings/src/auto/remote.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/remote.rs
rename to rust-bindings/src/auto/remote.rs
diff --git a/rust-bindings/rust/src/auto/repo.rs b/rust-bindings/src/auto/repo.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/repo.rs
rename to rust-bindings/src/auto/repo.rs
diff --git a/rust-bindings/rust/src/auto/repo_commit_modifier.rs b/rust-bindings/src/auto/repo_commit_modifier.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/repo_commit_modifier.rs
rename to rust-bindings/src/auto/repo_commit_modifier.rs
diff --git a/rust-bindings/rust/src/auto/repo_dev_ino_cache.rs b/rust-bindings/src/auto/repo_dev_ino_cache.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/repo_dev_ino_cache.rs
rename to rust-bindings/src/auto/repo_dev_ino_cache.rs
diff --git a/rust-bindings/rust/src/auto/repo_file.rs b/rust-bindings/src/auto/repo_file.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/repo_file.rs
rename to rust-bindings/src/auto/repo_file.rs
diff --git a/rust-bindings/rust/src/auto/repo_finder.rs b/rust-bindings/src/auto/repo_finder.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/repo_finder.rs
rename to rust-bindings/src/auto/repo_finder.rs
diff --git a/rust-bindings/rust/src/auto/repo_finder_avahi.rs b/rust-bindings/src/auto/repo_finder_avahi.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/repo_finder_avahi.rs
rename to rust-bindings/src/auto/repo_finder_avahi.rs
diff --git a/rust-bindings/rust/src/auto/repo_finder_config.rs b/rust-bindings/src/auto/repo_finder_config.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/repo_finder_config.rs
rename to rust-bindings/src/auto/repo_finder_config.rs
diff --git a/rust-bindings/rust/src/auto/repo_finder_mount.rs b/rust-bindings/src/auto/repo_finder_mount.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/repo_finder_mount.rs
rename to rust-bindings/src/auto/repo_finder_mount.rs
diff --git a/rust-bindings/rust/src/auto/repo_finder_override.rs b/rust-bindings/src/auto/repo_finder_override.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/repo_finder_override.rs
rename to rust-bindings/src/auto/repo_finder_override.rs
diff --git a/rust-bindings/rust/src/auto/repo_finder_result.rs b/rust-bindings/src/auto/repo_finder_result.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/repo_finder_result.rs
rename to rust-bindings/src/auto/repo_finder_result.rs
diff --git a/rust-bindings/rust/src/auto/se_policy.rs b/rust-bindings/src/auto/se_policy.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/se_policy.rs
rename to rust-bindings/src/auto/se_policy.rs
diff --git a/rust-bindings/rust/src/auto/sign.rs b/rust-bindings/src/auto/sign.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/sign.rs
rename to rust-bindings/src/auto/sign.rs
diff --git a/rust-bindings/rust/src/auto/sysroot.rs b/rust-bindings/src/auto/sysroot.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/sysroot.rs
rename to rust-bindings/src/auto/sysroot.rs
diff --git a/rust-bindings/rust/src/auto/sysroot_upgrader.rs b/rust-bindings/src/auto/sysroot_upgrader.rs
similarity index 100%
rename from rust-bindings/rust/src/auto/sysroot_upgrader.rs
rename to rust-bindings/src/auto/sysroot_upgrader.rs
diff --git a/rust-bindings/rust/src/auto/versions.txt b/rust-bindings/src/auto/versions.txt
similarity index 100%
rename from rust-bindings/rust/src/auto/versions.txt
rename to rust-bindings/src/auto/versions.txt
diff --git a/rust-bindings/rust/src/checksum.rs b/rust-bindings/src/checksum.rs
similarity index 100%
rename from rust-bindings/rust/src/checksum.rs
rename to rust-bindings/src/checksum.rs
diff --git a/rust-bindings/rust/src/collection_ref.rs b/rust-bindings/src/collection_ref.rs
similarity index 100%
rename from rust-bindings/rust/src/collection_ref.rs
rename to rust-bindings/src/collection_ref.rs
diff --git a/rust-bindings/rust/src/commit_sizes_entry.rs b/rust-bindings/src/commit_sizes_entry.rs
similarity index 100%
rename from rust-bindings/rust/src/commit_sizes_entry.rs
rename to rust-bindings/src/commit_sizes_entry.rs
diff --git a/rust-bindings/rust/src/constants.rs b/rust-bindings/src/constants.rs
similarity index 100%
rename from rust-bindings/rust/src/constants.rs
rename to rust-bindings/src/constants.rs
diff --git a/rust-bindings/rust/src/core.rs b/rust-bindings/src/core.rs
similarity index 100%
rename from rust-bindings/rust/src/core.rs
rename to rust-bindings/src/core.rs
diff --git a/rust-bindings/rust/src/functions.rs b/rust-bindings/src/functions.rs
similarity index 100%
rename from rust-bindings/rust/src/functions.rs
rename to rust-bindings/src/functions.rs
diff --git a/rust-bindings/rust/src/kernel_args.rs b/rust-bindings/src/kernel_args.rs
similarity index 100%
rename from rust-bindings/rust/src/kernel_args.rs
rename to rust-bindings/src/kernel_args.rs
diff --git a/rust-bindings/rust/src/lib.rs b/rust-bindings/src/lib.rs
similarity index 100%
rename from rust-bindings/rust/src/lib.rs
rename to rust-bindings/src/lib.rs
diff --git a/rust-bindings/rust/src/mutable_tree.rs b/rust-bindings/src/mutable_tree.rs
similarity index 100%
rename from rust-bindings/rust/src/mutable_tree.rs
rename to rust-bindings/src/mutable_tree.rs
diff --git a/rust-bindings/rust/src/object_details.rs b/rust-bindings/src/object_details.rs
similarity index 100%
rename from rust-bindings/rust/src/object_details.rs
rename to rust-bindings/src/object_details.rs
diff --git a/rust-bindings/rust/src/object_name.rs b/rust-bindings/src/object_name.rs
similarity index 100%
rename from rust-bindings/rust/src/object_name.rs
rename to rust-bindings/src/object_name.rs
diff --git a/rust-bindings/rust/src/repo.rs b/rust-bindings/src/repo.rs
similarity index 100%
rename from rust-bindings/rust/src/repo.rs
rename to rust-bindings/src/repo.rs
diff --git a/rust-bindings/rust/src/repo_checkout_at_options/mod.rs b/rust-bindings/src/repo_checkout_at_options/mod.rs
similarity index 100%
rename from rust-bindings/rust/src/repo_checkout_at_options/mod.rs
rename to rust-bindings/src/repo_checkout_at_options/mod.rs
diff --git a/rust-bindings/rust/src/repo_checkout_at_options/repo_checkout_filter.rs b/rust-bindings/src/repo_checkout_at_options/repo_checkout_filter.rs
similarity index 100%
rename from rust-bindings/rust/src/repo_checkout_at_options/repo_checkout_filter.rs
rename to rust-bindings/src/repo_checkout_at_options/repo_checkout_filter.rs
diff --git a/rust-bindings/rust/src/repo_transaction_stats.rs b/rust-bindings/src/repo_transaction_stats.rs
similarity index 100%
rename from rust-bindings/rust/src/repo_transaction_stats.rs
rename to rust-bindings/src/repo_transaction_stats.rs
diff --git a/rust-bindings/rust/src/se_policy.rs b/rust-bindings/src/se_policy.rs
similarity index 100%
rename from rust-bindings/rust/src/se_policy.rs
rename to rust-bindings/src/se_policy.rs
diff --git a/rust-bindings/rust/src/sysroot.rs b/rust-bindings/src/sysroot.rs
similarity index 100%
rename from rust-bindings/rust/src/sysroot.rs
rename to rust-bindings/src/sysroot.rs
diff --git a/rust-bindings/rust/src/sysroot_deploy_tree_opts.rs b/rust-bindings/src/sysroot_deploy_tree_opts.rs
similarity index 100%
rename from rust-bindings/rust/src/sysroot_deploy_tree_opts.rs
rename to rust-bindings/src/sysroot_deploy_tree_opts.rs
diff --git a/rust-bindings/rust/src/sysroot_write_deployments_opts.rs b/rust-bindings/src/sysroot_write_deployments_opts.rs
similarity index 100%
rename from rust-bindings/rust/src/sysroot_write_deployments_opts.rs
rename to rust-bindings/src/sysroot_write_deployments_opts.rs
diff --git a/rust-bindings/rust/src/tests/collection_ref.rs b/rust-bindings/src/tests/collection_ref.rs
similarity index 100%
rename from rust-bindings/rust/src/tests/collection_ref.rs
rename to rust-bindings/src/tests/collection_ref.rs
diff --git a/rust-bindings/rust/src/tests/kernel_args.rs b/rust-bindings/src/tests/kernel_args.rs
similarity index 100%
rename from rust-bindings/rust/src/tests/kernel_args.rs
rename to rust-bindings/src/tests/kernel_args.rs
diff --git a/rust-bindings/rust/src/tests/mod.rs b/rust-bindings/src/tests/mod.rs
similarity index 100%
rename from rust-bindings/rust/src/tests/mod.rs
rename to rust-bindings/src/tests/mod.rs
diff --git a/rust-bindings/rust/src/tests/repo.rs b/rust-bindings/src/tests/repo.rs
similarity index 100%
rename from rust-bindings/rust/src/tests/repo.rs
rename to rust-bindings/src/tests/repo.rs
diff --git a/rust-bindings/rust/sys/Cargo.toml b/rust-bindings/sys/Cargo.toml
similarity index 100%
rename from rust-bindings/rust/sys/Cargo.toml
rename to rust-bindings/sys/Cargo.toml
diff --git a/rust-bindings/rust/sys/LICENSE b/rust-bindings/sys/LICENSE
similarity index 100%
rename from rust-bindings/rust/sys/LICENSE
rename to rust-bindings/sys/LICENSE
diff --git a/rust-bindings/rust/sys/build.rs b/rust-bindings/sys/build.rs
similarity index 100%
rename from rust-bindings/rust/sys/build.rs
rename to rust-bindings/sys/build.rs
diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/sys/src/auto/versions.txt
similarity index 100%
rename from rust-bindings/rust/sys/src/auto/versions.txt
rename to rust-bindings/sys/src/auto/versions.txt
diff --git a/rust-bindings/rust/sys/src/lib.rs b/rust-bindings/sys/src/lib.rs
similarity index 100%
rename from rust-bindings/rust/sys/src/lib.rs
rename to rust-bindings/sys/src/lib.rs
diff --git a/rust-bindings/rust/sys/src/manual.rs b/rust-bindings/sys/src/manual.rs
similarity index 100%
rename from rust-bindings/rust/sys/src/manual.rs
rename to rust-bindings/sys/src/manual.rs
diff --git a/rust-bindings/rust/sys/tests/abi.rs b/rust-bindings/sys/tests/abi.rs
similarity index 100%
rename from rust-bindings/rust/sys/tests/abi.rs
rename to rust-bindings/sys/tests/abi.rs
diff --git a/rust-bindings/rust/sys/tests/constant.c b/rust-bindings/sys/tests/constant.c
similarity index 100%
rename from rust-bindings/rust/sys/tests/constant.c
rename to rust-bindings/sys/tests/constant.c
diff --git a/rust-bindings/rust/sys/tests/layout.c b/rust-bindings/sys/tests/layout.c
similarity index 100%
rename from rust-bindings/rust/sys/tests/layout.c
rename to rust-bindings/sys/tests/layout.c
diff --git a/rust-bindings/rust/sys/tests/manual.h b/rust-bindings/sys/tests/manual.h
similarity index 100%
rename from rust-bindings/rust/sys/tests/manual.h
rename to rust-bindings/sys/tests/manual.h
diff --git a/rust-bindings/rust/tests/core/mod.rs b/rust-bindings/tests/core/mod.rs
similarity index 100%
rename from rust-bindings/rust/tests/core/mod.rs
rename to rust-bindings/tests/core/mod.rs
diff --git a/rust-bindings/rust/tests/data/test.tar b/rust-bindings/tests/data/test.tar
similarity index 100%
rename from rust-bindings/rust/tests/data/test.tar
rename to rust-bindings/tests/data/test.tar
diff --git a/rust-bindings/rust/tests/functions/mod.rs b/rust-bindings/tests/functions/mod.rs
similarity index 100%
rename from rust-bindings/rust/tests/functions/mod.rs
rename to rust-bindings/tests/functions/mod.rs
diff --git a/rust-bindings/rust/tests/repo/checkout_at.rs b/rust-bindings/tests/repo/checkout_at.rs
similarity index 100%
rename from rust-bindings/rust/tests/repo/checkout_at.rs
rename to rust-bindings/tests/repo/checkout_at.rs
diff --git a/rust-bindings/rust/tests/repo/mod.rs b/rust-bindings/tests/repo/mod.rs
similarity index 100%
rename from rust-bindings/rust/tests/repo/mod.rs
rename to rust-bindings/tests/repo/mod.rs
diff --git a/rust-bindings/rust/tests/sign/mod.rs b/rust-bindings/tests/sign/mod.rs
similarity index 100%
rename from rust-bindings/rust/tests/sign/mod.rs
rename to rust-bindings/tests/sign/mod.rs
diff --git a/rust-bindings/rust/tests/tests.rs b/rust-bindings/tests/tests.rs
similarity index 100%
rename from rust-bindings/rust/tests/tests.rs
rename to rust-bindings/tests/tests.rs
diff --git a/rust-bindings/rust/tests/util/mod.rs b/rust-bindings/tests/util/mod.rs
similarity index 100%
rename from rust-bindings/rust/tests/util/mod.rs
rename to rust-bindings/tests/util/mod.rs