diff --git a/src/Arduino_Threads.h b/src/Arduino_Threads.h
index cb522c5..685b09c 100644
--- a/src/Arduino_Threads.h
+++ b/src/Arduino_Threads.h
@@ -26,14 +26,14 @@
 #include <mbed.h>
 #include <SharedPtr.h>
 
-#include "Sink.hpp"
-#include "Source.hpp"
-#include "Shared.hpp"
-
-#include "BusDevice.h"
-#include "spi/SpiBusDevice.h"
-#include "wire/WireBusDevice.h"
-#include "serial/SerialDispatcher.h"
+#include "threading/Sink.hpp"
+#include "threading/Source.hpp"
+#include "threading/Shared.hpp"
+
+#include "io/BusDevice.h"
+#include "io/spi/SpiBusDevice.h"
+#include "io/wire/WireBusDevice.h"
+#include "io/serial/SerialDispatcher.h"
 
 /**************************************************************************************
  * DEFINE
diff --git a/src/BusDevice.cpp b/src/io/BusDevice.cpp
similarity index 100%
rename from src/BusDevice.cpp
rename to src/io/BusDevice.cpp
diff --git a/src/BusDevice.h b/src/io/BusDevice.h
similarity index 100%
rename from src/BusDevice.h
rename to src/io/BusDevice.h
diff --git a/src/IoTransaction.h b/src/io/IoTransaction.h
similarity index 100%
rename from src/IoTransaction.h
rename to src/io/IoTransaction.h
diff --git a/src/serial/SerialDispatcher.cpp b/src/io/serial/SerialDispatcher.cpp
similarity index 100%
rename from src/serial/SerialDispatcher.cpp
rename to src/io/serial/SerialDispatcher.cpp
diff --git a/src/serial/SerialDispatcher.h b/src/io/serial/SerialDispatcher.h
similarity index 100%
rename from src/serial/SerialDispatcher.h
rename to src/io/serial/SerialDispatcher.h
diff --git a/src/spi/SpiBusDevice.cpp b/src/io/spi/SpiBusDevice.cpp
similarity index 100%
rename from src/spi/SpiBusDevice.cpp
rename to src/io/spi/SpiBusDevice.cpp
diff --git a/src/spi/SpiBusDevice.h b/src/io/spi/SpiBusDevice.h
similarity index 100%
rename from src/spi/SpiBusDevice.h
rename to src/io/spi/SpiBusDevice.h
diff --git a/src/spi/SpiBusDeviceConfig.h b/src/io/spi/SpiBusDeviceConfig.h
similarity index 100%
rename from src/spi/SpiBusDeviceConfig.h
rename to src/io/spi/SpiBusDeviceConfig.h
diff --git a/src/spi/SpiDispatcher.cpp b/src/io/spi/SpiDispatcher.cpp
similarity index 100%
rename from src/spi/SpiDispatcher.cpp
rename to src/io/spi/SpiDispatcher.cpp
diff --git a/src/spi/SpiDispatcher.h b/src/io/spi/SpiDispatcher.h
similarity index 100%
rename from src/spi/SpiDispatcher.h
rename to src/io/spi/SpiDispatcher.h
diff --git a/src/wire/WireBusDevice.cpp b/src/io/wire/WireBusDevice.cpp
similarity index 100%
rename from src/wire/WireBusDevice.cpp
rename to src/io/wire/WireBusDevice.cpp
diff --git a/src/wire/WireBusDevice.h b/src/io/wire/WireBusDevice.h
similarity index 100%
rename from src/wire/WireBusDevice.h
rename to src/io/wire/WireBusDevice.h
diff --git a/src/wire/WireBusDeviceConfig.h b/src/io/wire/WireBusDeviceConfig.h
similarity index 100%
rename from src/wire/WireBusDeviceConfig.h
rename to src/io/wire/WireBusDeviceConfig.h
diff --git a/src/wire/WireDispatcher.cpp b/src/io/wire/WireDispatcher.cpp
similarity index 100%
rename from src/wire/WireDispatcher.cpp
rename to src/io/wire/WireDispatcher.cpp
diff --git a/src/wire/WireDispatcher.h b/src/io/wire/WireDispatcher.h
similarity index 100%
rename from src/wire/WireDispatcher.h
rename to src/io/wire/WireDispatcher.h
diff --git a/src/Shared.hpp b/src/threading/Shared.hpp
similarity index 100%
rename from src/Shared.hpp
rename to src/threading/Shared.hpp
diff --git a/src/Sink.hpp b/src/threading/Sink.hpp
similarity index 100%
rename from src/Sink.hpp
rename to src/threading/Sink.hpp
diff --git a/src/Source.hpp b/src/threading/Source.hpp
similarity index 100%
rename from src/Source.hpp
rename to src/threading/Source.hpp