diff --git a/CMakeLists.txt b/CMakeLists.txt
index e46e90f3..23faa2b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,9 +19,9 @@ include(cmake/variables.cmake)
 
 add_library(
     aqnwb_aqnwb
-    src/BaseIO.cpp
+    src/io/BaseIO.cpp
     src/Channel.cpp
-    src/hdf5/HDF5IO.cpp
+    src/io/hdf5/HDF5IO.cpp
     src/nwb/NWBFile.cpp
     src/nwb/RecordingContainers.cpp
     src/nwb/base/TimeSeries.cpp
diff --git a/src/Utils.hpp b/src/Utils.hpp
index f98d5b30..c55352fe 100644
--- a/src/Utils.hpp
+++ b/src/Utils.hpp
@@ -8,9 +8,9 @@
 #include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "boost/date_time/c_local_time_adjustor.hpp"
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 
 namespace AQNWB
 {
diff --git a/src/BaseIO.cpp b/src/io/BaseIO.cpp
similarity index 99%
rename from src/BaseIO.cpp
rename to src/io/BaseIO.cpp
index 353f709d..b7facc23 100644
--- a/src/BaseIO.cpp
+++ b/src/io/BaseIO.cpp
@@ -1,4 +1,4 @@
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 
 #include "Utils.hpp"
 
diff --git a/src/BaseIO.hpp b/src/io/BaseIO.hpp
similarity index 100%
rename from src/BaseIO.hpp
rename to src/io/BaseIO.hpp
diff --git a/src/hdf5/HDF5IO.cpp b/src/io/hdf5/HDF5IO.cpp
similarity index 99%
rename from src/hdf5/HDF5IO.cpp
rename to src/io/hdf5/HDF5IO.cpp
index f85e25ce..7fb3f36d 100644
--- a/src/hdf5/HDF5IO.cpp
+++ b/src/io/hdf5/HDF5IO.cpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 
 #include <H5Cpp.h>
 #include <H5Fpublic.h>
diff --git a/src/hdf5/HDF5IO.hpp b/src/io/hdf5/HDF5IO.hpp
similarity index 99%
rename from src/hdf5/HDF5IO.hpp
rename to src/io/hdf5/HDF5IO.hpp
index e7bd2ccb..1155fa71 100644
--- a/src/hdf5/HDF5IO.hpp
+++ b/src/io/hdf5/HDF5IO.hpp
@@ -6,7 +6,7 @@
 
 #include <H5Opublic.h>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Types.hpp"
 
 namespace H5
diff --git a/src/nwb/NWBFile.cpp b/src/nwb/NWBFile.cpp
index bc27df59..d334db01 100644
--- a/src/nwb/NWBFile.cpp
+++ b/src/nwb/NWBFile.cpp
@@ -8,7 +8,7 @@
 
 #include "nwb/NWBFile.hpp"
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Channel.hpp"
 #include "Utils.hpp"
 #include "nwb/device/Device.hpp"
diff --git a/src/nwb/NWBFile.hpp b/src/nwb/NWBFile.hpp
index fa28ae85..8177aae5 100644
--- a/src/nwb/NWBFile.hpp
+++ b/src/nwb/NWBFile.hpp
@@ -7,7 +7,7 @@
 #include <string_view>
 #include <vector>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Types.hpp"
 #include "nwb/RecordingContainers.hpp"
 #include "nwb/base/TimeSeries.hpp"
diff --git a/src/nwb/base/TimeSeries.hpp b/src/nwb/base/TimeSeries.hpp
index 3fb6e081..111d3edb 100644
--- a/src/nwb/base/TimeSeries.hpp
+++ b/src/nwb/base/TimeSeries.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "nwb/hdmf/base/Container.hpp"
 
 namespace AQNWB::NWB
diff --git a/src/nwb/device/Device.hpp b/src/nwb/device/Device.hpp
index 51ace8dd..df56d8c0 100644
--- a/src/nwb/device/Device.hpp
+++ b/src/nwb/device/Device.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "nwb/hdmf/base/Container.hpp"
 
 namespace AQNWB::NWB
diff --git a/src/nwb/ecephys/ElectricalSeries.hpp b/src/nwb/ecephys/ElectricalSeries.hpp
index 8c6c9507..65a015b7 100644
--- a/src/nwb/ecephys/ElectricalSeries.hpp
+++ b/src/nwb/ecephys/ElectricalSeries.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Channel.hpp"
 #include "nwb/base/TimeSeries.hpp"
 
diff --git a/src/nwb/file/ElectrodeGroup.hpp b/src/nwb/file/ElectrodeGroup.hpp
index 4f4c55ca..16331cfe 100644
--- a/src/nwb/file/ElectrodeGroup.hpp
+++ b/src/nwb/file/ElectrodeGroup.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "nwb/device/Device.hpp"
 #include "nwb/hdmf/base/Container.hpp"
 
diff --git a/src/nwb/file/ElectrodeTable.hpp b/src/nwb/file/ElectrodeTable.hpp
index 909e1440..c31e2f55 100644
--- a/src/nwb/file/ElectrodeTable.hpp
+++ b/src/nwb/file/ElectrodeTable.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "nwb/hdmf/table/DynamicTable.hpp"
 #include "nwb/hdmf/table/ElementIdentifiers.hpp"
 #include "nwb/hdmf/table/VectorData.hpp"
diff --git a/src/nwb/hdmf/base/Container.hpp b/src/nwb/hdmf/base/Container.hpp
index e1e2c792..b7afa6c1 100644
--- a/src/nwb/hdmf/base/Container.hpp
+++ b/src/nwb/hdmf/base/Container.hpp
@@ -3,7 +3,7 @@
 #include <memory>
 #include <string>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 
 namespace AQNWB::NWB
 {
diff --git a/src/nwb/hdmf/base/Data.hpp b/src/nwb/hdmf/base/Data.hpp
index 2da8c212..5f6d7b33 100644
--- a/src/nwb/hdmf/base/Data.hpp
+++ b/src/nwb/hdmf/base/Data.hpp
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 
 namespace AQNWB::NWB
 {
diff --git a/src/nwb/hdmf/table/DynamicTable.hpp b/src/nwb/hdmf/table/DynamicTable.hpp
index 064cac56..680c0c8f 100644
--- a/src/nwb/hdmf/table/DynamicTable.hpp
+++ b/src/nwb/hdmf/table/DynamicTable.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "nwb/hdmf/base/Container.hpp"
 #include "nwb/hdmf/table/ElementIdentifiers.hpp"
 #include "nwb/hdmf/table/VectorData.hpp"
diff --git a/tests/examples/testWorkflowExamples.cpp b/tests/examples/testWorkflowExamples.cpp
index 252fa2c9..6dd113f0 100644
--- a/tests/examples/testWorkflowExamples.cpp
+++ b/tests/examples/testWorkflowExamples.cpp
@@ -1,11 +1,11 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Channel.hpp"
 #include "Types.hpp"
 #include "Utils.hpp"
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 #include "nwb/NWBFile.hpp"
 #include "nwb/RecordingContainers.hpp"
 #include "nwb/file/ElectrodeTable.hpp"
diff --git a/tests/examples/test_HDF5IO_examples.cpp b/tests/examples/test_HDF5IO_examples.cpp
index 3a978f60..e858246d 100644
--- a/tests/examples/test_HDF5IO_examples.cpp
+++ b/tests/examples/test_HDF5IO_examples.cpp
@@ -9,7 +9,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 #include "nwb/NWBFile.hpp"
 #include "nwb/file/ElectrodeTable.hpp"
 #include "testUtils.hpp"
diff --git a/tests/examples/test_ecephys_data_read.cpp b/tests/examples/test_ecephys_data_read.cpp
index 67c202ae..1ac4a7fe 100644
--- a/tests/examples/test_ecephys_data_read.cpp
+++ b/tests/examples/test_ecephys_data_read.cpp
@@ -2,11 +2,11 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_all.hpp>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Channel.hpp"
 #include "Types.hpp"
 #include "Utils.hpp"
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 #include "nwb/NWBFile.hpp"
 #include "nwb/RecordingContainers.hpp"
 #include "nwb/device/Device.hpp"
diff --git a/tests/examples/test_example.cpp b/tests/examples/test_example.cpp
index 356ec41f..11927de2 100644
--- a/tests/examples/test_example.cpp
+++ b/tests/examples/test_example.cpp
@@ -1,7 +1,7 @@
 // [example_all]
 #include <catch2/catch_test_macros.hpp>
 
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 #include "testUtils.hpp"
 
 TEST_CASE("SimpleExamples", "[hdf5io]")
diff --git a/tests/testBase.cpp b/tests/testBase.cpp
index f1f4cfc7..4e176f17 100644
--- a/tests/testBase.cpp
+++ b/tests/testBase.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_all.hpp>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Types.hpp"
 #include "Utils.hpp"
 #include "nwb/base/TimeSeries.hpp"
diff --git a/tests/testEcephys.cpp b/tests/testEcephys.cpp
index f36870bf..61a0bb2e 100644
--- a/tests/testEcephys.cpp
+++ b/tests/testEcephys.cpp
@@ -2,11 +2,11 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_all.hpp>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Channel.hpp"
 #include "Types.hpp"
 #include "Utils.hpp"
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 #include "nwb/device/Device.hpp"
 #include "nwb/ecephys/ElectricalSeries.hpp"
 #include "nwb/file/ElectrodeGroup.hpp"
diff --git a/tests/testFile.cpp b/tests/testFile.cpp
index ab52dc26..dd5170b8 100644
--- a/tests/testFile.cpp
+++ b/tests/testFile.cpp
@@ -1,9 +1,9 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Channel.hpp"
 #include "Types.hpp"
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 #include "nwb/file/ElectrodeTable.hpp"
 #include "testUtils.hpp"
 
diff --git a/tests/testHDF5IO.cpp b/tests/testHDF5IO.cpp
index c339c49e..59501785 100644
--- a/tests/testHDF5IO.cpp
+++ b/tests/testHDF5IO.cpp
@@ -8,10 +8,10 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Channel.hpp"
 #include "Types.hpp"
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 #include "nwb/NWBFile.hpp"
 #include "nwb/file/ElectrodeTable.hpp"
 #include "testUtils.hpp"
diff --git a/tests/testNWBFile.cpp b/tests/testNWBFile.cpp
index ddf7f0d4..fa147802 100644
--- a/tests/testNWBFile.cpp
+++ b/tests/testNWBFile.cpp
@@ -1,8 +1,8 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Utils.hpp"
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 #include "nwb/NWBFile.hpp"
 #include "nwb/RecordingContainers.hpp"
 #include "nwb/base/TimeSeries.hpp"
diff --git a/tests/testRecordingWorkflow.cpp b/tests/testRecordingWorkflow.cpp
index 86fd16b9..66ef98cf 100644
--- a/tests/testRecordingWorkflow.cpp
+++ b/tests/testRecordingWorkflow.cpp
@@ -3,11 +3,11 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_all.hpp>
 
-#include "BaseIO.hpp"
+#include "io/BaseIO.hpp"
 #include "Channel.hpp"
 #include "Types.hpp"
 #include "Utils.hpp"
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 #include "nwb/NWBFile.hpp"
 #include "nwb/RecordingContainers.hpp"
 #include "nwb/file/ElectrodeTable.hpp"
diff --git a/tests/testUtils.hpp b/tests/testUtils.hpp
index 914d8459..f7667f9a 100644
--- a/tests/testUtils.hpp
+++ b/tests/testUtils.hpp
@@ -9,7 +9,7 @@
 
 #include "Channel.hpp"
 #include "Types.hpp"
-#include "hdf5/HDF5IO.hpp"
+#include "io/hdf5/HDF5IO.hpp"
 
 using namespace AQNWB;
 namespace fs = std::filesystem;