diff --git a/cmd/camera_stream.c b/cmd/camera_stream.c
index 521aa4a..0420ba8 100644
--- a/cmd/camera_stream.c
+++ b/cmd/camera_stream.c
@@ -5,7 +5,7 @@
 #include "device/hw/v4l2.h"
 #include "http/http.h"
 #include "opts/opts.h"
-#include "device/camera.h"
+#include "device/camera/camera.h"
 
 #include <signal.h>
 
diff --git a/device/camera.c b/device/camera/camera.c
similarity index 100%
rename from device/camera.c
rename to device/camera/camera.c
diff --git a/device/camera.h b/device/camera/camera.h
similarity index 100%
rename from device/camera.h
rename to device/camera/camera.h
diff --git a/device/camera_decoder.c b/device/camera/camera_decoder.c
similarity index 100%
rename from device/camera_decoder.c
rename to device/camera/camera_decoder.c
diff --git a/device/camera_direct.c b/device/camera/camera_direct.c
similarity index 100%
rename from device/camera_direct.c
rename to device/camera/camera_direct.c
diff --git a/device/camera_isp.c b/device/camera/camera_isp.c
similarity index 100%
rename from device/camera_isp.c
rename to device/camera/camera_isp.c
diff --git a/device/camera_legacy_isp.c b/device/camera/camera_legacy_isp.c
similarity index 100%
rename from device/camera_legacy_isp.c
rename to device/camera/camera_legacy_isp.c