bootc-dev · cgwalters · Jul 17, 2025 · Jul 16, 2025 · Jul 16, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -103,7 +103,7 @@ jobs:
           df -h /
           # The ostree-container tests
           sudo podman run --privileged --pid=host -v /:/run/host -v $(pwd):/src:ro -v /var/tmp:/var/tmp \
-            -v /run/dbus:/run/dbus -v /run/systemd:/run/systemd localhost/bootc /src/ostree-ext/ci/priv-integration.sh
+            -v /run/dbus:/run/dbus -v /run/systemd:/run/systemd localhost/bootc /src/crates/ostree-ext/ci/priv-integration.sh
           # Nondestructive but privileged tests
           sudo bootc-integration-tests host-privileged localhost/bootc-integration
           # Install tests

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,17 +1,5 @@
 [workspace]
-members = [
-    "cli",
-    "system-reinstall-bootc",
-    "lib",
-    "mount",
-    "ostree-ext",
-    "utils",
-    "blockdev",
-    "xtask",
-    "tests-integration",
-    "tmpfiles",
-    "sysusers",
-]
+members = ["crates/*"]
 resolver = "2"
 
 [profile.dev]

diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ install:
 	install -d -m 0755 $(DESTDIR)$(prefix)/lib/bootc/bound-images.d
 	install -d -m 0755 $(DESTDIR)$(prefix)/lib/bootc/kargs.d
 	ln -s /sysroot/ostree/bootc/storage $(DESTDIR)$(prefix)/lib/bootc/storage
-	install -D -m 0755 cli/bootc-generator-stub $(DESTDIR)$(prefix)/lib/systemd/system-generators/bootc-systemd-generator 
+	install -D -m 0755 crates/cli/bootc-generator-stub $(DESTDIR)$(prefix)/lib/systemd/system-generators/bootc-systemd-generator 
 	install -d $(DESTDIR)$(prefix)/lib/bootc/install
 	# Support installing pre-generated man pages shipped in source tarball, to avoid
 	# a dependency on pandoc downstream.  But in local builds these end up in target/man,
@@ -75,8 +75,8 @@ CLIPPY_CONFIG = -A clippy::all -D clippy::correctness -D clippy::suspicious -Dun
 validate-rust:
 	cargo fmt -- --check -l
 	cargo test --no-run
-	(cd ostree-ext && cargo check --no-default-features)
-	(cd lib && cargo check --no-default-features)
+	(cd crates/ostree-ext && cargo check --no-default-features)
+	(cd crates/lib && cargo check --no-default-features)
 	cargo clippy -- $(CLIPPY_CONFIG)
 	env RUSTDOCFLAGS='-D warnings' cargo doc --lib
 .PHONY: validate-rust

diff --git a/blockdev/Cargo.toml → crates/blockdev/Cargo.toml b/blockdev/Cargo.toml → crates/blockdev/Cargo.toml
diff --git a/blockdev/src/blockdev.rs → crates/blockdev/src/blockdev.rs b/blockdev/src/blockdev.rs → crates/blockdev/src/blockdev.rs
diff --git a/blockdev/tests/fixtures/lsblk.json → crates/blockdev/tests/fixtures/lsblk.json b/blockdev/tests/fixtures/lsblk.json → crates/blockdev/tests/fixtures/lsblk.json
diff --git a/cli/Cargo.toml → crates/cli/Cargo.toml b/cli/Cargo.toml → crates/cli/Cargo.toml
@@ -5,7 +5,6 @@ version = "0.0.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/bootc-dev/bootc"
-readme = "README.md"
 publish = false
 default-run = "bootc"
 

diff --git a/cli/bootc-generator-stub → crates/cli/bootc-generator-stub b/cli/bootc-generator-stub → crates/cli/bootc-generator-stub
diff --git a/cli/src/main.rs → crates/cli/src/main.rs b/cli/src/main.rs → crates/cli/src/main.rs
diff --git a/lib/Cargo.toml → crates/lib/Cargo.toml b/lib/Cargo.toml → crates/lib/Cargo.toml
@@ -3,7 +3,6 @@ description = "bootc implementation"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 name = "bootc-lib"
-readme = "README.md"
 repository = "https://github.com/bootc-dev/bootc"
 # The intention is we'll follow semver here, even though this
 # project isn't actually published as a crate.

diff --git a/lib/LICENSE-APACHE → crates/lib/LICENSE-APACHE b/lib/LICENSE-APACHE → crates/lib/LICENSE-APACHE
diff --git a/lib/LICENSE-MIT → crates/lib/LICENSE-MIT b/lib/LICENSE-MIT → crates/lib/LICENSE-MIT
diff --git a/lib/README.md → crates/lib/README.md b/lib/README.md → crates/lib/README.md
diff --git a/lib/src/bootloader.rs → crates/lib/src/bootloader.rs b/lib/src/bootloader.rs → crates/lib/src/bootloader.rs
diff --git a/lib/src/boundimage.rs → crates/lib/src/boundimage.rs b/lib/src/boundimage.rs → crates/lib/src/boundimage.rs
diff --git a/lib/src/cli.rs → crates/lib/src/cli.rs b/lib/src/cli.rs → crates/lib/src/cli.rs
diff --git a/lib/src/containerenv.rs → crates/lib/src/containerenv.rs b/lib/src/containerenv.rs → crates/lib/src/containerenv.rs
diff --git a/lib/src/deploy.rs → crates/lib/src/deploy.rs b/lib/src/deploy.rs → crates/lib/src/deploy.rs
diff --git a/lib/src/docgen.rs → crates/lib/src/docgen.rs b/lib/src/docgen.rs → crates/lib/src/docgen.rs
diff --git a/lib/src/fixtures/spec-booted-pinned.yaml → .../lib/src/fixtures/spec-booted-pinned.yaml b/lib/src/fixtures/spec-booted-pinned.yaml → .../lib/src/fixtures/spec-booted-pinned.yaml
diff --git a/lib/src/fixtures/spec-only-booted.yaml → ...es/lib/src/fixtures/spec-only-booted.yaml b/lib/src/fixtures/spec-only-booted.yaml → ...es/lib/src/fixtures/spec-only-booted.yaml
diff --git a/lib/src/fixtures/spec-ostree-remote.yaml → .../lib/src/fixtures/spec-ostree-remote.yaml b/lib/src/fixtures/spec-ostree-remote.yaml → .../lib/src/fixtures/spec-ostree-remote.yaml
diff --git a/lib/src/fixtures/spec-ostree-to-bootc.yaml → ...ib/src/fixtures/spec-ostree-to-bootc.yaml b/lib/src/fixtures/spec-ostree-to-bootc.yaml → ...ib/src/fixtures/spec-ostree-to-bootc.yaml
diff --git a/.../fixtures/spec-rfe-ostree-deployment.yaml → .../fixtures/spec-rfe-ostree-deployment.yaml b/.../fixtures/spec-rfe-ostree-deployment.yaml → .../fixtures/spec-rfe-ostree-deployment.yaml
diff --git a/lib/src/fixtures/spec-staged-booted.yaml → .../lib/src/fixtures/spec-staged-booted.yaml b/lib/src/fixtures/spec-staged-booted.yaml → .../lib/src/fixtures/spec-staged-booted.yaml
diff --git a/lib/src/fixtures/spec-staged-rollback.yaml → ...ib/src/fixtures/spec-staged-rollback.yaml b/lib/src/fixtures/spec-staged-rollback.yaml → ...ib/src/fixtures/spec-staged-rollback.yaml
diff --git a/lib/src/fixtures/spec-v1-null.json → crates/lib/src/fixtures/spec-v1-null.json b/lib/src/fixtures/spec-v1-null.json → crates/lib/src/fixtures/spec-v1-null.json
diff --git a/lib/src/fixtures/spec-v1a1-orig.yaml → crates/lib/src/fixtures/spec-v1a1-orig.yaml b/lib/src/fixtures/spec-v1a1-orig.yaml → crates/lib/src/fixtures/spec-v1a1-orig.yaml
diff --git a/lib/src/fixtures/spec-v1a1.yaml → crates/lib/src/fixtures/spec-v1a1.yaml b/lib/src/fixtures/spec-v1a1.yaml → crates/lib/src/fixtures/spec-v1a1.yaml
diff --git a/lib/src/fixtures/spec-via-local-oci.yaml → .../lib/src/fixtures/spec-via-local-oci.yaml b/lib/src/fixtures/spec-via-local-oci.yaml → .../lib/src/fixtures/spec-via-local-oci.yaml
diff --git a/lib/src/fsck.rs → crates/lib/src/fsck.rs b/lib/src/fsck.rs → crates/lib/src/fsck.rs
diff --git a/lib/src/generator.rs → crates/lib/src/generator.rs b/lib/src/generator.rs → crates/lib/src/generator.rs
diff --git a/lib/src/glyph.rs → crates/lib/src/glyph.rs b/lib/src/glyph.rs → crates/lib/src/glyph.rs
diff --git a/lib/src/image.rs → crates/lib/src/image.rs b/lib/src/image.rs → crates/lib/src/image.rs
diff --git a/lib/src/imgstorage.rs → crates/lib/src/imgstorage.rs b/lib/src/imgstorage.rs → crates/lib/src/imgstorage.rs
diff --git a/lib/src/install.rs → crates/lib/src/install.rs b/lib/src/install.rs → crates/lib/src/install.rs
diff --git a/lib/src/install/baseline.rs → crates/lib/src/install/baseline.rs b/lib/src/install/baseline.rs → crates/lib/src/install/baseline.rs
diff --git a/lib/src/install/completion.rs → crates/lib/src/install/completion.rs b/lib/src/install/completion.rs → crates/lib/src/install/completion.rs
diff --git a/lib/src/install/config.rs → crates/lib/src/install/config.rs b/lib/src/install/config.rs → crates/lib/src/install/config.rs
diff --git a/lib/src/install/osbuild.rs → crates/lib/src/install/osbuild.rs b/lib/src/install/osbuild.rs → crates/lib/src/install/osbuild.rs
diff --git a/lib/src/install/osconfig.rs → crates/lib/src/install/osconfig.rs b/lib/src/install/osconfig.rs → crates/lib/src/install/osconfig.rs
diff --git a/lib/src/journal.rs → crates/lib/src/journal.rs b/lib/src/journal.rs → crates/lib/src/journal.rs
diff --git a/lib/src/k8sapitypes.rs → crates/lib/src/k8sapitypes.rs b/lib/src/k8sapitypes.rs → crates/lib/src/k8sapitypes.rs
diff --git a/lib/src/kargs.rs → crates/lib/src/kargs.rs b/lib/src/kargs.rs → crates/lib/src/kargs.rs
diff --git a/lib/src/kernel.rs → crates/lib/src/kernel.rs b/lib/src/kernel.rs → crates/lib/src/kernel.rs
diff --git a/lib/src/lib.rs → crates/lib/src/lib.rs b/lib/src/lib.rs → crates/lib/src/lib.rs
diff --git a/lib/src/lints.rs → crates/lib/src/lints.rs b/lib/src/lints.rs → crates/lib/src/lints.rs
@@ -806,7 +806,7 @@ mod tests {
 
         const PREPAREROOT_PATH: &str = "usr/lib/ostree/prepare-root.conf";
         const PREPAREROOT: &str =
-            include_str!("../../baseimage/base/usr/lib/ostree/prepare-root.conf");
+            include_str!("../../../baseimage/base/usr/lib/ostree/prepare-root.conf");
         root.create_dir_all(Utf8Path::new(PREPAREROOT_PATH).parent().unwrap())?;
         root.atomic_write(PREPAREROOT_PATH, PREPAREROOT)?;
 

diff --git a/lib/src/lsm.rs → crates/lib/src/lsm.rs b/lib/src/lsm.rs → crates/lib/src/lsm.rs
diff --git a/lib/src/metadata.rs → crates/lib/src/metadata.rs b/lib/src/metadata.rs → crates/lib/src/metadata.rs
diff --git a/lib/src/podman.rs → crates/lib/src/podman.rs b/lib/src/podman.rs → crates/lib/src/podman.rs
diff --git a/lib/src/progress_jsonl.rs → crates/lib/src/progress_jsonl.rs b/lib/src/progress_jsonl.rs → crates/lib/src/progress_jsonl.rs
diff --git a/lib/src/reboot.rs → crates/lib/src/reboot.rs b/lib/src/reboot.rs → crates/lib/src/reboot.rs
diff --git a/lib/src/reexec.rs → crates/lib/src/reexec.rs b/lib/src/reexec.rs → crates/lib/src/reexec.rs
diff --git a/lib/src/rhsm.rs → crates/lib/src/rhsm.rs b/lib/src/rhsm.rs → crates/lib/src/rhsm.rs
diff --git a/lib/src/spec.rs → crates/lib/src/spec.rs b/lib/src/spec.rs → crates/lib/src/spec.rs
diff --git a/lib/src/status.rs → crates/lib/src/status.rs b/lib/src/status.rs → crates/lib/src/status.rs
diff --git a/lib/src/store/mod.rs → crates/lib/src/store/mod.rs b/lib/src/store/mod.rs → crates/lib/src/store/mod.rs
diff --git a/lib/src/store/ostree_container.rs → crates/lib/src/store/ostree_container.rs b/lib/src/store/ostree_container.rs → crates/lib/src/store/ostree_container.rs
diff --git a/lib/src/systemglue/mod.rs → crates/lib/src/systemglue/mod.rs b/lib/src/systemglue/mod.rs → crates/lib/src/systemglue/mod.rs
diff --git a/lib/src/task.rs → crates/lib/src/task.rs b/lib/src/task.rs → crates/lib/src/task.rs
diff --git a/lib/src/utils.rs → crates/lib/src/utils.rs b/lib/src/utils.rs → crates/lib/src/utils.rs
diff --git a/mount/Cargo.toml → crates/mount/Cargo.toml b/mount/Cargo.toml → crates/mount/Cargo.toml
diff --git a/mount/src/mount.rs → crates/mount/src/mount.rs b/mount/src/mount.rs → crates/mount/src/mount.rs
diff --git a/ostree-ext/.github/workflows/rust.yml → crates/ostree-ext/.github/workflows/rust.yml b/ostree-ext/.github/workflows/rust.yml → crates/ostree-ext/.github/workflows/rust.yml
diff --git a/ostree-ext/.gitignore → crates/ostree-ext/.gitignore b/ostree-ext/.gitignore → crates/ostree-ext/.gitignore
diff --git a/ostree-ext/Cargo.toml → crates/ostree-ext/Cargo.toml b/ostree-ext/Cargo.toml → crates/ostree-ext/Cargo.toml
@@ -4,7 +4,6 @@ description = "Extension APIs for OSTree"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 name = "ostree-ext"
-readme = "../README.md"
 repository = "https://github.com/ostreedev/ostree-rs-ext"
 version = "0.15.3"
 

diff --git a/ostree-ext/LICENSE-APACHE → crates/ostree-ext/LICENSE-APACHE b/ostree-ext/LICENSE-APACHE → crates/ostree-ext/LICENSE-APACHE
diff --git a/ostree-ext/LICENSE-MIT → crates/ostree-ext/LICENSE-MIT b/ostree-ext/LICENSE-MIT → crates/ostree-ext/LICENSE-MIT
diff --git a/ostree-ext/README.md → crates/ostree-ext/README.md b/ostree-ext/README.md → crates/ostree-ext/README.md
diff --git a/ostree-ext/ci/container-build-integration.sh → ...ree-ext/ci/container-build-integration.sh b/ostree-ext/ci/container-build-integration.sh → ...ree-ext/ci/container-build-integration.sh
diff --git a/ostree-ext/ci/ima.sh → crates/ostree-ext/ci/ima.sh b/ostree-ext/ci/ima.sh → crates/ostree-ext/ci/ima.sh
diff --git a/ostree-ext/ci/installdeps.sh → crates/ostree-ext/ci/installdeps.sh b/ostree-ext/ci/installdeps.sh → crates/ostree-ext/ci/installdeps.sh
diff --git a/ostree-ext/ci/integration.sh → crates/ostree-ext/ci/integration.sh b/ostree-ext/ci/integration.sh → crates/ostree-ext/ci/integration.sh
diff --git a/ostree-ext/ci/lints.sh → crates/ostree-ext/ci/lints.sh b/ostree-ext/ci/lints.sh → crates/ostree-ext/ci/lints.sh
diff --git a/ostree-ext/ci/priv-integration.sh → crates/ostree-ext/ci/priv-integration.sh b/ostree-ext/ci/priv-integration.sh → crates/ostree-ext/ci/priv-integration.sh
diff --git a/ostree-ext/ci/priv-test-cockpit-selinux.sh → ...stree-ext/ci/priv-test-cockpit-selinux.sh b/ostree-ext/ci/priv-test-cockpit-selinux.sh → ...stree-ext/ci/priv-test-cockpit-selinux.sh
diff --git a/ostree-ext/deny.toml → crates/ostree-ext/deny.toml b/ostree-ext/deny.toml → crates/ostree-ext/deny.toml
diff --git a/ostree-ext/docs/container-image-import.dot → ...stree-ext/docs/container-image-import.dot b/ostree-ext/docs/container-image-import.dot → ...stree-ext/docs/container-image-import.dot
diff --git a/ostree-ext/docs/container-image-import.svg → ...stree-ext/docs/container-image-import.svg b/ostree-ext/docs/container-image-import.svg → ...stree-ext/docs/container-image-import.svg
diff --git a/ostree-ext/docs/questions-and-answers.md → .../ostree-ext/docs/questions-and-answers.md b/ostree-ext/docs/questions-and-answers.md → .../ostree-ext/docs/questions-and-answers.md
diff --git a/ostree-ext/man/ostree-container-auth.md → ...s/ostree-ext/man/ostree-container-auth.md b/ostree-ext/man/ostree-container-auth.md → ...s/ostree-ext/man/ostree-container-auth.md
diff --git a/ostree-ext/ostree-and-containers.md → crates/ostree-ext/ostree-and-containers.md b/ostree-ext/ostree-and-containers.md → crates/ostree-ext/ostree-and-containers.md
diff --git a/ostree-ext/src/bootabletree.rs → crates/ostree-ext/src/bootabletree.rs b/ostree-ext/src/bootabletree.rs → crates/ostree-ext/src/bootabletree.rs
diff --git a/ostree-ext/src/chunking.rs → crates/ostree-ext/src/chunking.rs b/ostree-ext/src/chunking.rs → crates/ostree-ext/src/chunking.rs
diff --git a/ostree-ext/src/cli.rs → crates/ostree-ext/src/cli.rs b/ostree-ext/src/cli.rs → crates/ostree-ext/src/cli.rs
diff --git a/ostree-ext/src/commit.rs → crates/ostree-ext/src/commit.rs b/ostree-ext/src/commit.rs → crates/ostree-ext/src/commit.rs
diff --git a/ostree-ext/src/container/deploy.rs → crates/ostree-ext/src/container/deploy.rs b/ostree-ext/src/container/deploy.rs → crates/ostree-ext/src/container/deploy.rs
diff --git a/ostree-ext/src/container/encapsulate.rs → ...s/ostree-ext/src/container/encapsulate.rs b/ostree-ext/src/container/encapsulate.rs → ...s/ostree-ext/src/container/encapsulate.rs
diff --git a/ostree-ext/src/container/mod.rs → crates/ostree-ext/src/container/mod.rs b/ostree-ext/src/container/mod.rs → crates/ostree-ext/src/container/mod.rs
diff --git a/ostree-ext/src/container/skopeo.rs → crates/ostree-ext/src/container/skopeo.rs b/ostree-ext/src/container/skopeo.rs → crates/ostree-ext/src/container/skopeo.rs
diff --git a/ostree-ext/src/container/store.rs → crates/ostree-ext/src/container/store.rs b/ostree-ext/src/container/store.rs → crates/ostree-ext/src/container/store.rs
diff --git a/...ainer/tests/it/fixtures/exampleos.tar.zst → ...ainer/tests/it/fixtures/exampleos.tar.zst b/...ainer/tests/it/fixtures/exampleos.tar.zst → ...ainer/tests/it/fixtures/exampleos.tar.zst
diff --git a/ostree-ext/src/container/unencapsulate.rs → ...ostree-ext/src/container/unencapsulate.rs b/ostree-ext/src/container/unencapsulate.rs → ...ostree-ext/src/container/unencapsulate.rs
diff --git a/...-ext/src/container/update_detachedmeta.rs → ...-ext/src/container/update_detachedmeta.rs b/...-ext/src/container/update_detachedmeta.rs → ...-ext/src/container/update_detachedmeta.rs
diff --git a/ostree-ext/src/container_utils.rs → crates/ostree-ext/src/container_utils.rs b/ostree-ext/src/container_utils.rs → crates/ostree-ext/src/container_utils.rs
diff --git a/ostree-ext/src/diff.rs → crates/ostree-ext/src/diff.rs b/ostree-ext/src/diff.rs → crates/ostree-ext/src/diff.rs
diff --git a/ostree-ext/src/docgen.rs → crates/ostree-ext/src/docgen.rs b/ostree-ext/src/docgen.rs → crates/ostree-ext/src/docgen.rs
diff --git a/ostree-ext/src/fixture.rs → crates/ostree-ext/src/fixture.rs b/ostree-ext/src/fixture.rs → crates/ostree-ext/src/fixture.rs
diff --git a/...ixtures/fedora-coreos-contentmeta.json.gz → ...ixtures/fedora-coreos-contentmeta.json.gz b/...ixtures/fedora-coreos-contentmeta.json.gz → ...ixtures/fedora-coreos-contentmeta.json.gz
diff --git a/.../src/fixtures/ostree-gpg-test-home.tar.gz → .../src/fixtures/ostree-gpg-test-home.tar.gz b/.../src/fixtures/ostree-gpg-test-home.tar.gz → .../src/fixtures/ostree-gpg-test-home.tar.gz
diff --git a/ostree-ext/src/fsverity.rs → crates/ostree-ext/src/fsverity.rs b/ostree-ext/src/fsverity.rs → crates/ostree-ext/src/fsverity.rs
diff --git a/ostree-ext/src/globals.rs → crates/ostree-ext/src/globals.rs b/ostree-ext/src/globals.rs → crates/ostree-ext/src/globals.rs
diff --git a/ostree-ext/src/ima.rs → crates/ostree-ext/src/ima.rs b/ostree-ext/src/ima.rs → crates/ostree-ext/src/ima.rs
diff --git a/ostree-ext/src/integrationtest.rs → crates/ostree-ext/src/integrationtest.rs b/ostree-ext/src/integrationtest.rs → crates/ostree-ext/src/integrationtest.rs
diff --git a/ostree-ext/src/isolation.rs → crates/ostree-ext/src/isolation.rs b/ostree-ext/src/isolation.rs → crates/ostree-ext/src/isolation.rs
diff --git a/ostree-ext/src/keyfileext.rs → crates/ostree-ext/src/keyfileext.rs b/ostree-ext/src/keyfileext.rs → crates/ostree-ext/src/keyfileext.rs
diff --git a/ostree-ext/src/lib.rs → crates/ostree-ext/src/lib.rs b/ostree-ext/src/lib.rs → crates/ostree-ext/src/lib.rs
diff --git a/ostree-ext/src/logging.rs → crates/ostree-ext/src/logging.rs b/ostree-ext/src/logging.rs → crates/ostree-ext/src/logging.rs
diff --git a/ostree-ext/src/objectsource.rs → crates/ostree-ext/src/objectsource.rs b/ostree-ext/src/objectsource.rs → crates/ostree-ext/src/objectsource.rs
diff --git a/ostree-ext/src/objgv.rs → crates/ostree-ext/src/objgv.rs b/ostree-ext/src/objgv.rs → crates/ostree-ext/src/objgv.rs
diff --git a/ostree-ext/src/ostree_manual.rs → crates/ostree-ext/src/ostree_manual.rs b/ostree-ext/src/ostree_manual.rs → crates/ostree-ext/src/ostree_manual.rs
diff --git a/ostree-ext/src/ostree_prepareroot.rs → crates/ostree-ext/src/ostree_prepareroot.rs b/ostree-ext/src/ostree_prepareroot.rs → crates/ostree-ext/src/ostree_prepareroot.rs
diff --git a/ostree-ext/src/refescape.rs → crates/ostree-ext/src/refescape.rs b/ostree-ext/src/refescape.rs → crates/ostree-ext/src/refescape.rs
diff --git a/ostree-ext/src/repair.rs → crates/ostree-ext/src/repair.rs b/ostree-ext/src/repair.rs → crates/ostree-ext/src/repair.rs
diff --git a/ostree-ext/src/selinux.rs → crates/ostree-ext/src/selinux.rs b/ostree-ext/src/selinux.rs → crates/ostree-ext/src/selinux.rs
diff --git a/ostree-ext/src/statistics.rs → crates/ostree-ext/src/statistics.rs b/ostree-ext/src/statistics.rs → crates/ostree-ext/src/statistics.rs
diff --git a/ostree-ext/src/sysroot.rs → crates/ostree-ext/src/sysroot.rs b/ostree-ext/src/sysroot.rs → crates/ostree-ext/src/sysroot.rs
diff --git a/ostree-ext/src/tar/export.rs → crates/ostree-ext/src/tar/export.rs b/ostree-ext/src/tar/export.rs → crates/ostree-ext/src/tar/export.rs
diff --git a/ostree-ext/src/tar/import.rs → crates/ostree-ext/src/tar/import.rs b/ostree-ext/src/tar/import.rs → crates/ostree-ext/src/tar/import.rs
diff --git a/ostree-ext/src/tar/mod.rs → crates/ostree-ext/src/tar/mod.rs b/ostree-ext/src/tar/mod.rs → crates/ostree-ext/src/tar/mod.rs
diff --git a/ostree-ext/src/tar/write.rs → crates/ostree-ext/src/tar/write.rs b/ostree-ext/src/tar/write.rs → crates/ostree-ext/src/tar/write.rs
diff --git a/ostree-ext/src/tokio_util.rs → crates/ostree-ext/src/tokio_util.rs b/ostree-ext/src/tokio_util.rs → crates/ostree-ext/src/tokio_util.rs
diff --git a/ostree-ext/src/utils.rs → crates/ostree-ext/src/utils.rs b/ostree-ext/src/utils.rs → crates/ostree-ext/src/utils.rs
diff --git a/ostree-ext/tests/it/fixtures/hlinks.tar.gz → ...stree-ext/tests/it/fixtures/hlinks.tar.gz b/ostree-ext/tests/it/fixtures/hlinks.tar.gz → ...stree-ext/tests/it/fixtures/hlinks.tar.gz
diff --git a/ostree-ext/tests/it/fixtures/manifest1.json → ...tree-ext/tests/it/fixtures/manifest1.json b/ostree-ext/tests/it/fixtures/manifest1.json → ...tree-ext/tests/it/fixtures/manifest1.json
diff --git a/ostree-ext/tests/it/fixtures/manifest2.json → ...tree-ext/tests/it/fixtures/manifest2.json b/ostree-ext/tests/it/fixtures/manifest2.json → ...tree-ext/tests/it/fixtures/manifest2.json
diff --git a/ostree-ext/tests/it/main.rs → crates/ostree-ext/tests/it/main.rs b/ostree-ext/tests/it/main.rs → crates/ostree-ext/tests/it/main.rs
diff --git a/system-reinstall-bootc/Cargo.toml → crates/system-reinstall-bootc/Cargo.toml b/system-reinstall-bootc/Cargo.toml → crates/system-reinstall-bootc/Cargo.toml
@@ -4,7 +4,6 @@ version = "0.1.9"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/bootc-dev/bootc"
-readme = "README.md"
 publish = false
 # For now don't bump this above what is currently shipped in RHEL9.
 rust-version = "1.75.0"

diff --git a/system-reinstall-bootc/sample_config.yaml → ...system-reinstall-bootc/sample_config.yaml b/system-reinstall-bootc/sample_config.yaml → ...system-reinstall-bootc/sample_config.yaml
diff --git a/system-reinstall-bootc/src/btrfs.rs → crates/system-reinstall-bootc/src/btrfs.rs b/system-reinstall-bootc/src/btrfs.rs → crates/system-reinstall-bootc/src/btrfs.rs
diff --git a/system-reinstall-bootc/src/config/cli.rs → .../system-reinstall-bootc/src/config/cli.rs b/system-reinstall-bootc/src/config/cli.rs → .../system-reinstall-bootc/src/config/cli.rs
diff --git a/system-reinstall-bootc/src/config/mod.rs → .../system-reinstall-bootc/src/config/mod.rs b/system-reinstall-bootc/src/config/mod.rs → .../system-reinstall-bootc/src/config/mod.rs
diff --git a/system-reinstall-bootc/src/lvm.rs → crates/system-reinstall-bootc/src/lvm.rs b/system-reinstall-bootc/src/lvm.rs → crates/system-reinstall-bootc/src/lvm.rs
diff --git a/system-reinstall-bootc/src/main.rs → crates/system-reinstall-bootc/src/main.rs b/system-reinstall-bootc/src/main.rs → crates/system-reinstall-bootc/src/main.rs
diff --git a/system-reinstall-bootc/src/podman.rs → crates/system-reinstall-bootc/src/podman.rs b/system-reinstall-bootc/src/podman.rs → crates/system-reinstall-bootc/src/podman.rs
diff --git a/system-reinstall-bootc/src/prompt.rs → crates/system-reinstall-bootc/src/prompt.rs b/system-reinstall-bootc/src/prompt.rs → crates/system-reinstall-bootc/src/prompt.rs
diff --git a/system-reinstall-bootc/src/users.rs → crates/system-reinstall-bootc/src/users.rs b/system-reinstall-bootc/src/users.rs → crates/system-reinstall-bootc/src/users.rs
diff --git a/...nstall-bootc/tests/fixtures/loginctl.json → ...nstall-bootc/tests/fixtures/loginctl.json b/...nstall-bootc/tests/fixtures/loginctl.json → ...nstall-bootc/tests/fixtures/loginctl.json
diff --git a/sysusers/Cargo.toml → crates/sysusers/Cargo.toml b/sysusers/Cargo.toml → crates/sysusers/Cargo.toml
diff --git a/sysusers/src/lib.rs → crates/sysusers/src/lib.rs b/sysusers/src/lib.rs → crates/sysusers/src/lib.rs
diff --git a/sysusers/src/nameservice/group.rs → crates/sysusers/src/nameservice/group.rs b/sysusers/src/nameservice/group.rs → crates/sysusers/src/nameservice/group.rs
diff --git a/sysusers/src/nameservice/mod.rs → crates/sysusers/src/nameservice/mod.rs b/sysusers/src/nameservice/mod.rs → crates/sysusers/src/nameservice/mod.rs
diff --git a/sysusers/src/nameservice/passwd.rs → crates/sysusers/src/nameservice/passwd.rs b/sysusers/src/nameservice/passwd.rs → crates/sysusers/src/nameservice/passwd.rs
diff --git a/sysusers/src/nameservice/shadow.rs → crates/sysusers/src/nameservice/shadow.rs b/sysusers/src/nameservice/shadow.rs → crates/sysusers/src/nameservice/shadow.rs
diff --git a/tests-integration/Cargo.toml → crates/tests-integration/Cargo.toml b/tests-integration/Cargo.toml → crates/tests-integration/Cargo.toml
diff --git a/tests-integration/README.md → crates/tests-integration/README.md b/tests-integration/README.md → crates/tests-integration/README.md
diff --git a/tests-integration/src/container.rs → crates/tests-integration/src/container.rs b/tests-integration/src/container.rs → crates/tests-integration/src/container.rs
diff --git a/tests-integration/src/hostpriv.rs → crates/tests-integration/src/hostpriv.rs b/tests-integration/src/hostpriv.rs → crates/tests-integration/src/hostpriv.rs
diff --git a/tests-integration/src/install.rs → crates/tests-integration/src/install.rs b/tests-integration/src/install.rs → crates/tests-integration/src/install.rs
diff --git a/tests-integration/src/runvm.rs → crates/tests-integration/src/runvm.rs b/tests-integration/src/runvm.rs → crates/tests-integration/src/runvm.rs
diff --git a/tests-integration/src/selinux.rs → crates/tests-integration/src/selinux.rs b/tests-integration/src/selinux.rs → crates/tests-integration/src/selinux.rs
diff --git a/tests-integration/src/system_reinstall.rs → ...tests-integration/src/system_reinstall.rs b/tests-integration/src/system_reinstall.rs → ...tests-integration/src/system_reinstall.rs
diff --git a/tests-integration/src/tests-integration.rs → ...ests-integration/src/tests-integration.rs b/tests-integration/src/tests-integration.rs → ...ests-integration/src/tests-integration.rs
diff --git a/tmpfiles/Cargo.toml → crates/tmpfiles/Cargo.toml b/tmpfiles/Cargo.toml → crates/tmpfiles/Cargo.toml
diff --git a/tmpfiles/src/lib.rs → crates/tmpfiles/src/lib.rs b/tmpfiles/src/lib.rs → crates/tmpfiles/src/lib.rs
diff --git a/utils/Cargo.toml → crates/utils/Cargo.toml b/utils/Cargo.toml → crates/utils/Cargo.toml
diff --git a/utils/src/command.rs → crates/utils/src/command.rs b/utils/src/command.rs → crates/utils/src/command.rs
diff --git a/utils/src/iterators.rs → crates/utils/src/iterators.rs b/utils/src/iterators.rs → crates/utils/src/iterators.rs
diff --git a/utils/src/lib.rs → crates/utils/src/lib.rs b/utils/src/lib.rs → crates/utils/src/lib.rs
diff --git a/utils/src/path.rs → crates/utils/src/path.rs b/utils/src/path.rs → crates/utils/src/path.rs
diff --git a/utils/src/timestamp.rs → crates/utils/src/timestamp.rs b/utils/src/timestamp.rs → crates/utils/src/timestamp.rs
diff --git a/utils/src/tracing_util.rs → crates/utils/src/tracing_util.rs b/utils/src/tracing_util.rs → crates/utils/src/tracing_util.rs
diff --git a/xtask/Cargo.toml → crates/xtask/Cargo.toml b/xtask/Cargo.toml → crates/xtask/Cargo.toml
diff --git a/xtask/src/xtask.rs → crates/xtask/src/xtask.rs b/xtask/src/xtask.rs → crates/xtask/src/xtask.rs