diff --git a/src/data_format/bound_symbol_list.h b/src/data_format/bound_symbol_list.h
index fbb7f7e..96c366c 100644
--- a/src/data_format/bound_symbol_list.h
+++ b/src/data_format/bound_symbol_list.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "data_format/io/io_base.h"
 #include "data_format/type/bound_symbol.h"
+#include "io/io_base.h"
 
 namespace di::data_format {
 
diff --git a/src/data_format/magic_blob.h b/src/data_format/magic_blob.h
index 9b03c1d..459e3c3 100644
--- a/src/data_format/magic_blob.h
+++ b/src/data_format/magic_blob.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "data_format/io/streamed_io.h"
 #include "data_format/type/magic_entry.h"
+#include "io/streamed_io.h"
 
 namespace di::data_format {
 
diff --git a/src/data_format/raw_text.h b/src/data_format/raw_text.h
index 9948a53..205638f 100644
--- a/src/data_format/raw_text.h
+++ b/src/data_format/raw_text.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "data_format/io/io_base.h"
+#include "io/io_base.h"
 
 namespace di::data_format {
 
diff --git a/src/data_format/typed_symbol_list.h b/src/data_format/typed_symbol_list.h
index 112a7ad..2278d24 100644
--- a/src/data_format/typed_symbol_list.h
+++ b/src/data_format/typed_symbol_list.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "data_format/io/io_base.h"
+#include "io/io_base.h"
 
 #include "data_format/type/decl_type.h"
 #include "data_format/type/typed_symbol.h"
diff --git a/src/data_format/io/io_base.h b/src/io/io_base.h
similarity index 100%
rename from src/data_format/io/io_base.h
rename to src/io/io_base.h
diff --git a/src/data_format/io/streamed_io.cpp b/src/io/streamed_io.cpp
similarity index 89%
rename from src/data_format/io/streamed_io.cpp
rename to src/io/streamed_io.cpp
index 4f2c398..6886fcc 100644
--- a/src/data_format/io/streamed_io.cpp
+++ b/src/io/streamed_io.cpp
@@ -1,4 +1,4 @@
-#include "data_format/io/streamed_io.h"
+#include "io/streamed_io.h"
 
 namespace di {
 
diff --git a/src/data_format/io/streamed_io.h b/src/io/streamed_io.h
similarity index 96%
rename from src/data_format/io/streamed_io.h
rename to src/io/streamed_io.h
index 42c97b8..af261fb 100644
--- a/src/data_format/io/streamed_io.h
+++ b/src/io/streamed_io.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "data_format/io/io_base.h"
+#include "io/io_base.h"
 
 namespace di {