diff --git a/gemma/configs.cc b/gemma/configs.cc
index cb508e8..c926368 100644
--- a/gemma/configs.cc
+++ b/gemma/configs.cc
@@ -22,8 +22,8 @@
 #include <vector>
 
 #include "compression/types.h"  // Type
-#include "io/fields.h"          // IFields
-#include "io/io.h"              // Path
+#include "gemma/io/fields.h"          // IFields
+#include "gemma/io/io.h"              // Path
 #include "hwy/base.h"
 
 namespace gcpp {
diff --git a/gemma/configs.h b/gemma/configs.h
index f1bd0c5..c54b5cd 100644
--- a/gemma/configs.h
+++ b/gemma/configs.h
@@ -26,8 +26,8 @@
 #include <vector>
 
 #include "compression/types.h"  // Type
-#include "io/fields.h"          // IFieldsVisitor
-#include "io/io.h"              // Path
+#include "gemma/io/fields.h"          // IFieldsVisitor
+#include "gemma/io/io.h"              // Path
 #include "util/basics.h"
 
 namespace gcpp {
diff --git a/gemma/configs_test.cc b/gemma/configs_test.cc
index 0ca4a84..95db2e5 100644
--- a/gemma/configs_test.cc
+++ b/gemma/configs_test.cc
@@ -7,7 +7,7 @@
 
 #include "gtest/gtest.h"
 #include "compression/types.h"  // Type
-#include "io/fields.h"           // Type
+#include "gemma/io/fields.h"           // Type
 
 namespace gcpp {
 
diff --git a/gemma/gemma.cc b/gemma/gemma.cc
index 5a48d00..40e2862 100644
--- a/gemma/gemma.cc
+++ b/gemma/gemma.cc
@@ -58,8 +58,8 @@
 #include "gemma/configs.h"
 #include "gemma/model_store.h"
 #include "gemma/weights.h"
-#include "io/blob_store.h"
-#include "io/io.h"  // Path
+#include "gemma/io/blob_store.h"
+#include "gemma/io/io.h"  // Path
 #include "ops/matmul.h"
 #include "paligemma/image.h"
 #include "util/basics.h"
diff --git a/gemma/gemma.h b/gemma/gemma.h
index b630a8c..5e9d9dd 100644
--- a/gemma/gemma.h
+++ b/gemma/gemma.h
@@ -29,8 +29,8 @@
 #include "gemma/model_store.h"
 #include "gemma/query.h"
 #include "gemma/weights.h"
-#include "io/blob_store.h"
-#include "io/io.h"       // Path
+#include "gemma/io/blob_store.h"
+#include "gemma/io/io.h"       // Path
 #include "ops/matmul.h"  // MatMulEnv
 #include "paligemma/image.h"
 #include "util/basics.h"  // TokenAndProb
diff --git a/gemma/gemma_args.h b/gemma/gemma_args.h
index 6ccb5b3..fc85433 100644
--- a/gemma/gemma_args.h
+++ b/gemma/gemma_args.h
@@ -27,7 +27,7 @@
 
 #include "compression/types.h"
 #include "gemma/configs.h"
-#include "io/io.h"        // Path
+#include "gemma/io/io.h"        // Path
 #include "util/args.h"    // IWYU pragma: export
 #include "util/basics.h"  // Tristate
 #include "util/mat.h"
diff --git a/io/BUILD.bazel b/gemma/io/BUILD.bazel
similarity index 100%
rename from io/BUILD.bazel
rename to gemma/io/BUILD.bazel
diff --git a/io/blob_compare.cc b/gemma/io/blob_compare.cc
similarity index 100%
rename from io/blob_compare.cc
rename to gemma/io/blob_compare.cc
diff --git a/io/blob_store.cc b/gemma/io/blob_store.cc
similarity index 100%
rename from io/blob_store.cc
rename to gemma/io/blob_store.cc
diff --git a/io/blob_store.h b/gemma/io/blob_store.h
similarity index 100%
rename from io/blob_store.h
rename to gemma/io/blob_store.h
diff --git a/io/blob_store_test.cc b/gemma/io/blob_store_test.cc
similarity index 100%
rename from io/blob_store_test.cc
rename to gemma/io/blob_store_test.cc
diff --git a/io/fields.cc b/gemma/io/fields.cc
similarity index 100%
rename from io/fields.cc
rename to gemma/io/fields.cc
diff --git a/io/fields.h b/gemma/io/fields.h
similarity index 100%
rename from io/fields.h
rename to gemma/io/fields.h
diff --git a/io/fields_test.cc b/gemma/io/fields_test.cc
similarity index 100%
rename from io/fields_test.cc
rename to gemma/io/fields_test.cc
diff --git a/io/io.cc b/gemma/io/io.cc
similarity index 100%
rename from io/io.cc
rename to gemma/io/io.cc
diff --git a/io/io.h b/gemma/io/io.h
similarity index 100%
rename from io/io.h
rename to gemma/io/io.h
diff --git a/io/io_win.cc b/gemma/io/io_win.cc
similarity index 100%
rename from io/io_win.cc
rename to gemma/io/io_win.cc
diff --git a/io/migrate_weights.cc b/gemma/io/migrate_weights.cc
similarity index 100%
rename from io/migrate_weights.cc
rename to gemma/io/migrate_weights.cc
diff --git a/gemma/model_store.cc b/gemma/model_store.cc
index 76f0c75..ac6b701 100644
--- a/gemma/model_store.cc
+++ b/gemma/model_store.cc
@@ -30,9 +30,9 @@
 #include "gemma/configs.h"  // ModelConfig, kMaxQKVDim
 #include "gemma/tensor_info.h"
 #include "gemma/tokenizer.h"
-#include "io/blob_store.h"
-#include "io/fields.h"
-#include "io/io.h"  // Path
+#include "gemma/io/blob_store.h"
+#include "gemma/io/fields.h"
+#include "gemma/io/io.h"  // Path
 #include "util/basics.h"
 #include "util/threading_context.h"
 #include "hwy/base.h"
diff --git a/gemma/model_store.h b/gemma/model_store.h
index 506fb77..39f23c7 100644
--- a/gemma/model_store.h
+++ b/gemma/model_store.h
@@ -28,11 +28,12 @@
 
 // IWYU pragma: begin_exports
 #include "gemma/configs.h"  // ModelConfig
+#include "gemma/io/blob_store.h"
 #include "gemma/tokenizer.h"
-#include "io/blob_store.h"
-#include "io/io.h"        // Path
+#include "gemma/io/io.h"        // Path
 #include "util/basics.h"  // Tristate
 #include "util/mat.h"     // MatPtr
+
 // IWYU pragma: end_exports
 
 #include "util/allocator.h"
diff --git a/gemma/tensor_stats.cc b/gemma/tensor_stats.cc
index 62dcb98..41cc356 100644
--- a/gemma/tensor_stats.cc
+++ b/gemma/tensor_stats.cc
@@ -24,7 +24,7 @@
 #include <cmath>
 #include <memory>
 
-#include "io/io.h"
+#include "gemma/io/io.h"
 #include "util/mat.h"
 #include "util/threading_context.h"
 #include "util/zones.h"
diff --git a/gemma/weights.cc b/gemma/weights.cc
index 00c12c6..0c138ff 100644
--- a/gemma/weights.cc
+++ b/gemma/weights.cc
@@ -29,7 +29,7 @@
 #include "gemma/configs.h"
 #include "gemma/gemma_args.h"
 #include "gemma/model_store.h"
-#include "io/blob_store.h"
+#include "gemma/io/blob_store.h"
 #include "util/mat.h"
 #include "util/threading_context.h"
 #include "util/zones.h"
diff --git a/gemma/weights.h b/gemma/weights.h
index 4476e22..b18e6c4 100644
--- a/gemma/weights.h
+++ b/gemma/weights.h
@@ -27,7 +27,7 @@
 #include "gemma/gemma_args.h"   // InferenceArgs
 #include "gemma/model_store.h"  // ModelStore
 #include "gemma/tensor_info.h"  // TensorInfoRegistry
-#include "io/blob_store.h"      // BlobWriter
+#include "gemma/io/blob_store.h"      // BlobWriter
 #include "util/mat.h"           // MatPtr
 #include "util/threading_context.h"