diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2ddfc8..7ec4d56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ target_include_directories(tinysd_sdio INTERFACE include)
 
 # SDHCI host driver target
 add_library(tinysd_sdhci INTERFACE)
-target_sources(tinysd_sdhci INTERFACE src/sdhci.c)
+target_sources(tinysd_sdhci INTERFACE src/host/sdhci.c)
 target_include_directories(tinysd_sdhci INTERFACE include)
 
 # Frame and CRC helpers target, for software hosts
diff --git a/include/tinysd.h b/include/tinysd.h
index 4cd9c61..0db4001 100644
--- a/include/tinysd.h
+++ b/include/tinysd.h
@@ -9,5 +9,5 @@
 #include <tinysd/errors.h>
 #include <tinysd/frame.h>
 #include <tinysd/host.h>
-#include <tinysd/sdhci.h>
+#include <tinysd/host/sdhci.h>
 #include <tinysd/sdio.h>
diff --git a/include/tinysd/sdhci.h b/include/tinysd/host/sdhci.h
similarity index 100%
rename from include/tinysd/sdhci.h
rename to include/tinysd/host/sdhci.h
diff --git a/src/sdhci.c b/src/host/sdhci.c
similarity index 99%
rename from src/sdhci.c
rename to src/host/sdhci.c
index 9ad6c76..ba6b6df 100644
--- a/src/sdhci.c
+++ b/src/host/sdhci.c
@@ -3,7 +3,7 @@
 #include <tinysd/bits.h>
 #include <tinysd/delay.h>
 
-#include <tinysd/sdhci.h>
+#include <tinysd/host/sdhci.h>
 
 // Every bit of the normal and error interrupt status registers
 #define INT_ALL 0xffffffffu