diff --git a/core/src/s9pk/mod.rs b/core/src/s9pk/mod.rs
deleted file mode 100644
index 6720f2999..000000000
--- a/core/src/s9pk/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod merkle_archive;
-pub mod v1;
-pub mod v2;
-
-pub use v1::*;
diff --git a/core/src/s9pk/merkle_archive/directory_contents.rs b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/directory_contents.rs
rename to core/startos/src/s9pk/merkle_archive/directory_contents.rs
diff --git a/core/src/s9pk/merkle_archive/file_contents.rs b/core/startos/src/s9pk/merkle_archive/file_contents.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/file_contents.rs
rename to core/startos/src/s9pk/merkle_archive/file_contents.rs
diff --git a/core/src/s9pk/merkle_archive/hash.rs b/core/startos/src/s9pk/merkle_archive/hash.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/hash.rs
rename to core/startos/src/s9pk/merkle_archive/hash.rs
diff --git a/core/src/s9pk/merkle_archive/mod.rs b/core/startos/src/s9pk/merkle_archive/mod.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/mod.rs
rename to core/startos/src/s9pk/merkle_archive/mod.rs
diff --git a/core/src/s9pk/merkle_archive/sink.rs b/core/startos/src/s9pk/merkle_archive/sink.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/sink.rs
rename to core/startos/src/s9pk/merkle_archive/sink.rs
diff --git a/core/src/s9pk/merkle_archive/source/http.rs b/core/startos/src/s9pk/merkle_archive/source/http.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/source/http.rs
rename to core/startos/src/s9pk/merkle_archive/source/http.rs
diff --git a/core/src/s9pk/merkle_archive/source/mod.rs b/core/startos/src/s9pk/merkle_archive/source/mod.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/source/mod.rs
rename to core/startos/src/s9pk/merkle_archive/source/mod.rs
diff --git a/core/src/s9pk/merkle_archive/source/multi_cursor_file.rs b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/source/multi_cursor_file.rs
rename to core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
diff --git a/core/src/s9pk/merkle_archive/test.rs b/core/startos/src/s9pk/merkle_archive/test.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/test.rs
rename to core/startos/src/s9pk/merkle_archive/test.rs
diff --git a/core/src/s9pk/merkle_archive/varint.rs b/core/startos/src/s9pk/merkle_archive/varint.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/varint.rs
rename to core/startos/src/s9pk/merkle_archive/varint.rs
diff --git a/core/src/s9pk/merkle_archive/write_queue.rs b/core/startos/src/s9pk/merkle_archive/write_queue.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/write_queue.rs
rename to core/startos/src/s9pk/merkle_archive/write_queue.rs
diff --git a/core/src/s9pk/v1/builder.rs b/core/startos/src/s9pk/v1/builder.rs
similarity index 100%
rename from core/src/s9pk/v1/builder.rs
rename to core/startos/src/s9pk/v1/builder.rs
diff --git a/core/src/s9pk/v1/docker.rs b/core/startos/src/s9pk/v1/docker.rs
similarity index 100%
rename from core/src/s9pk/v1/docker.rs
rename to core/startos/src/s9pk/v1/docker.rs
diff --git a/core/src/s9pk/v1/git_hash.rs b/core/startos/src/s9pk/v1/git_hash.rs
similarity index 100%
rename from core/src/s9pk/v1/git_hash.rs
rename to core/startos/src/s9pk/v1/git_hash.rs
diff --git a/core/src/s9pk/v1/header.rs b/core/startos/src/s9pk/v1/header.rs
similarity index 100%
rename from core/src/s9pk/v1/header.rs
rename to core/startos/src/s9pk/v1/header.rs
diff --git a/core/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
similarity index 100%
rename from core/src/s9pk/v1/manifest.rs
rename to core/startos/src/s9pk/v1/manifest.rs
diff --git a/core/src/s9pk/v1/mod.rs b/core/startos/src/s9pk/v1/mod.rs
similarity index 100%
rename from core/src/s9pk/v1/mod.rs
rename to core/startos/src/s9pk/v1/mod.rs
diff --git a/core/src/s9pk/v1/reader.rs b/core/startos/src/s9pk/v1/reader.rs
similarity index 100%
rename from core/src/s9pk/v1/reader.rs
rename to core/startos/src/s9pk/v1/reader.rs
diff --git a/core/src/s9pk/v2/mod.rs b/core/startos/src/s9pk/v2/mod.rs
similarity index 100%
rename from core/src/s9pk/v2/mod.rs
rename to core/startos/src/s9pk/v2/mod.rs
diff --git a/core/src/s9pk/v2/specv2.md b/core/startos/src/s9pk/v2/specv2.md
similarity index 100%
rename from core/src/s9pk/v2/specv2.md
rename to core/startos/src/s9pk/v2/specv2.md