diff --git a/src/audio/CMakeLists.txt b/src/audio/CMakeLists.txt
index 425756f7e4d5..5cdd05085b56 100644
--- a/src/audio/CMakeLists.txt
+++ b/src/audio/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 
 if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 	add_local_sources(sof
-		host-legacy.c
+		host/host-legacy.c
 		component.c
 		buffer.c
 		source_api_helper.c
diff --git a/src/audio/host/CMakeLists.txt b/src/audio/host/CMakeLists.txt
new file mode 100644
index 000000000000..a21244c5c6b0
--- /dev/null
+++ b/src/audio/host/CMakeLists.txt
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+if(CONFIG_ZEPHYR_NATIVE_DRIVERS)
+	zephyr_library_sources(
+		host-zephyr.c
+	)
+else()
+	zephyr_library_sources(
+		host-legacy.c
+	)
+endif()
\ No newline at end of file
diff --git a/src/audio/host-legacy.c b/src/audio/host/host-legacy.c
similarity index 99%
rename from src/audio/host-legacy.c
rename to src/audio/host/host-legacy.c
index bd418c0fe5f2..20671c120f9a 100644
--- a/src/audio/host-legacy.c
+++ b/src/audio/host/host-legacy.c
@@ -32,7 +32,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include "copier/host_copier.h"
+#include "../copier/host_copier.h"
 
 static const struct comp_driver comp_host;
 
diff --git a/src/audio/host-zephyr.c b/src/audio/host/host-zephyr.c
similarity index 99%
rename from src/audio/host-zephyr.c
rename to src/audio/host/host-zephyr.c
index 998dca300b76..8d35bbe5aec7 100644
--- a/src/audio/host-zephyr.c
+++ b/src/audio/host/host-zephyr.c
@@ -32,8 +32,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "copier/copier.h"
-#include "copier/host_copier.h"
+#include "../copier/copier.h"
+#include "../copier/host_copier.h"
 
 static const struct comp_driver comp_host;
 
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 2c7e78222934..75f99e686061 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -412,11 +412,11 @@ endif()
 
 if(CONFIG_ZEPHYR_NATIVE_DRIVERS)
 	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/host-zephyr.c
+		${SOF_AUDIO_PATH}/host/host-zephyr.c
 	)
 else()
 	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/host-legacy.c
+		${SOF_AUDIO_PATH}/host/host-legacy.c
 	)
 endif()