diff --git a/cmd/camera-streamer/http.c b/cmd/camera-streamer/http.c
index 8e2b171..32a98a4 100644
--- a/cmd/camera-streamer/http.c
+++ b/cmd/camera-streamer/http.c
@@ -1,7 +1,7 @@
 #include "http/http.h"
-#include "opts/opts.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/opts.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
 #include "rtsp/rtsp.h"
 
diff --git a/cmd/camera-streamer/main.c b/cmd/camera-streamer/main.c
index dc4450f..6d8daf3 100644
--- a/cmd/camera-streamer/main.c
+++ b/cmd/camera-streamer/main.c
@@ -1,7 +1,7 @@
 #include "http/http.h"
-#include "opts/opts.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/opts.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
 #include "rtsp/rtsp.h"
 
diff --git a/cmd/camera-streamer/opts.c b/cmd/camera-streamer/opts.c
index 34977df..46c0cfd 100644
--- a/cmd/camera-streamer/opts.c
+++ b/cmd/camera-streamer/opts.c
@@ -1,7 +1,7 @@
 #include "http/http.h"
-#include "opts/opts.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/opts.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
 #include "rtsp/rtsp.h"
 
diff --git a/device/buffer.c b/device/buffer.c
index b29e037..14b62c9 100644
--- a/device/buffer.c
+++ b/device/buffer.c
@@ -1,7 +1,7 @@
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 buffer_t *buffer_open(const char *name, buffer_list_t *buf_list, int index) {
   buffer_t *buf = calloc(1, sizeof(buffer_t));
diff --git a/device/buffer_list.c b/device/buffer_list.c
index aab728c..80b6ef7 100644
--- a/device/buffer_list.c
+++ b/device/buffer_list.c
@@ -1,8 +1,8 @@
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 
 buffer_list_t *buffer_list_open(const char *name, int index, struct device_s *dev, const char *path, buffer_format_t fmt, bool do_capture, bool do_mmap)
 {
diff --git a/device/buffer_lock.c b/device/buffer_lock.c
index 80d4536..3a92acc 100644
--- a/device/buffer_lock.c
+++ b/device/buffer_lock.c
@@ -1,7 +1,7 @@
 #include "device/buffer_lock.h"
 #include "device/buffer_list.h"
 #include "device/buffer.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 bool buffer_lock_is_used(buffer_lock_t *buf_lock)
 {
diff --git a/device/buffer_queue.c b/device/buffer_queue.c
index 51ae685..38c4071 100644
--- a/device/buffer_queue.c
+++ b/device/buffer_queue.c
@@ -1,7 +1,7 @@
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 #include <pthread.h>
 #include <inttypes.h>
diff --git a/device/camera/camera.c b/device/camera/camera.c
index 49a9410..5a9710b 100644
--- a/device/camera/camera.c
+++ b/device/camera/camera.c
@@ -3,8 +3,8 @@
 #include "device/device.h"
 #include "device/buffer_list.h"
 #include "device/links.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 
 camera_t *camera_open(camera_options_t *options)
 {
diff --git a/device/camera/camera_input.c b/device/camera/camera_input.c
index c3be2c3..9f6d82f 100644
--- a/device/camera/camera_input.c
+++ b/device/camera/camera_input.c
@@ -4,8 +4,8 @@
 #include "device/buffer_list.h"
 #include "device/device.h"
 #include "device/links.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 
 static int camera_configure_input_v4l2(camera_t *camera)
 {
diff --git a/device/camera/camera_isp.c b/device/camera/camera_isp.c
index 93f800b..63408db 100644
--- a/device/camera/camera_isp.c
+++ b/device/camera/camera_isp.c
@@ -4,8 +4,8 @@
 #include "device/buffer_list.h"
 #include "device/device.h"
 #include "device/links.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 #include "device/buffer_list.h"
 #include "http/http.h"
 
diff --git a/device/camera/camera_output.c b/device/camera/camera_output.c
index 8067283..f644a6a 100644
--- a/device/camera/camera_output.c
+++ b/device/camera/camera_output.c
@@ -4,8 +4,8 @@
 #include "device/buffer_list.h"
 #include "device/device.h"
 #include "device/links.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 #include "device/buffer_list.h"
 #include "http/http.h"
 #include "rtsp/rtsp.h"
diff --git a/device/device.c b/device/device.c
index b5de691..a85e726 100644
--- a/device/device.c
+++ b/device/device.c
@@ -1,8 +1,8 @@
 #include "device/device.h"
 #include "device/buffer.h"
 #include "device/buffer_list.h"
-#include "opts/log.h"
-#include "opts/opts.h"
+#include "util/opts/log.h"
+#include "util/opts/opts.h"
 
 device_t *device_open(const char *name, const char *path, device_hw_t *hw) {
   device_t *dev = calloc(1, sizeof(device_t));
diff --git a/device/libcamera/fake_camera.c b/device/libcamera/fake_camera.c
index 4c57749..9b1ef32 100644
--- a/device/libcamera/fake_camera.c
+++ b/device/libcamera/fake_camera.c
@@ -8,7 +8,7 @@
 
 #include <linux/media.h>
 
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 // This is special code to force `libcamera` to think that given sensor is different
 // ex.: fake `arducam_64mp` to be run as `imx519`
diff --git a/device/libcamera/libcamera.hh b/device/libcamera/libcamera.hh
index 646e626..3c986f4 100644
--- a/device/libcamera/libcamera.hh
+++ b/device/libcamera/libcamera.hh
@@ -10,9 +10,9 @@ extern "C" {
 #include "device/device.h"
 #include "device/buffer_list.h"
 #include "device/buffer.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
-#include "opts/control.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
+#include "util/opts/control.h"
 };
 
 #ifdef USE_LIBCAMERA
diff --git a/device/links.c b/device/links.c
index 99a7471..5779dd4 100644
--- a/device/links.c
+++ b/device/links.c
@@ -2,8 +2,8 @@
 #include "device/device.h"
 #include "device/buffer.h"
 #include "device/buffer_list.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 
 #define N_FDS 50
 #define QUEUE_ON_CAPTURE // seems to provide better latency
diff --git a/device/v4l2/buffer.c b/device/v4l2/buffer.c
index 2af5f78..8cbb130 100644
--- a/device/v4l2/buffer.c
+++ b/device/v4l2/buffer.c
@@ -2,7 +2,7 @@
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 int v4l2_buffer_open(buffer_t *buf)
 {
diff --git a/device/v4l2/buffer_list.c b/device/v4l2/buffer_list.c
index 28dcc8f..fdcf9e2 100644
--- a/device/v4l2/buffer_list.c
+++ b/device/v4l2/buffer_list.c
@@ -2,8 +2,8 @@
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 
 int v4l2_buffer_list_open(buffer_list_t *buf_list)
 {
diff --git a/device/v4l2/debug.c b/device/v4l2/debug.c
index 39651b7..328b382 100644
--- a/device/v4l2/debug.c
+++ b/device/v4l2/debug.c
@@ -1,7 +1,7 @@
 #include "v4l2.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 int v4l2_buffer_list_refresh_states(buffer_list_t *buf_list)
 {
diff --git a/device/v4l2/device.c b/device/v4l2/device.c
index 321b381..423afe8 100644
--- a/device/v4l2/device.c
+++ b/device/v4l2/device.c
@@ -1,6 +1,6 @@
 #include "v4l2.h"
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 int v4l2_device_open(device_t *dev)
 {
diff --git a/device/v4l2/device_media.c b/device/v4l2/device_media.c
index d39ef5a..3ebf344 100644
--- a/device/v4l2/device_media.c
+++ b/device/v4l2/device_media.c
@@ -1,7 +1,7 @@
 #include "v4l2.h"
 
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 #include <unistd.h>
 #include <dirent.h>
diff --git a/device/v4l2/device_options.c b/device/v4l2/device_options.c
index 8534f47..a7a064e 100644
--- a/device/v4l2/device_options.c
+++ b/device/v4l2/device_options.c
@@ -1,7 +1,7 @@
 #include "v4l2.h"
 #include "device/device.h"
-#include "opts/log.h"
-#include "opts/control.h"
+#include "util/opts/log.h"
+#include "util/opts/control.h"
 
 int v4l2_device_set_option_by_id(device_t *dev, const char *name, uint32_t id, int32_t value)
 {
diff --git a/ffmpeg/remuxer.c b/ffmpeg/remuxer.c
index 64a3d34..3cc0f0c 100644
--- a/ffmpeg/remuxer.c
+++ b/ffmpeg/remuxer.c
@@ -1,5 +1,5 @@
 #include "ffmpeg/remuxer.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 #include <inttypes.h>
 
diff --git a/http/http.c b/http/http.c
index fc72fc7..54b156a 100644
--- a/http/http.c
+++ b/http/http.c
@@ -12,7 +12,7 @@
 #include <signal.h>
 
 #include "http/http.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 static int http_listen(int port, int maxcons)
 {
diff --git a/http/http_ffmpeg.c b/http/http_ffmpeg.c
index 855df41..4cf8a72 100644
--- a/http/http_ffmpeg.c
+++ b/http/http_ffmpeg.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "opts/log.h"
+#include "util/opts/log.h"
 #include "http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_lock.h"
diff --git a/http/http_h264.c b/http/http_h264.c
index c3d5739..3a3efd3 100644
--- a/http/http_h264.c
+++ b/http/http_h264.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "opts/log.h"
+#include "util/opts/log.h"
 #include "http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_lock.h"
diff --git a/rtsp/rtsp.cc b/rtsp/rtsp.cc
index 4dc1adc..b96e4b3 100644
--- a/rtsp/rtsp.cc
+++ b/rtsp/rtsp.cc
@@ -4,9 +4,9 @@ extern "C" {
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
-#include "opts/control.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
+#include "util/opts/control.h"
 #include "rtsp.h"
 
 };
diff --git a/opts/control.c b/util/opts/control.c
similarity index 100%
rename from opts/control.c
rename to util/opts/control.c
diff --git a/opts/control.h b/util/opts/control.h
similarity index 100%
rename from opts/control.h
rename to util/opts/control.h
diff --git a/opts/fourcc.c b/util/opts/fourcc.c
similarity index 100%
rename from opts/fourcc.c
rename to util/opts/fourcc.c
diff --git a/opts/fourcc.h b/util/opts/fourcc.h
similarity index 100%
rename from opts/fourcc.h
rename to util/opts/fourcc.h
diff --git a/opts/log.c b/util/opts/log.c
similarity index 97%
rename from opts/log.c
rename to util/opts/log.c
index 1d4fba8..0e943fa 100644
--- a/opts/log.c
+++ b/util/opts/log.c
@@ -1,5 +1,5 @@
-#include "opts/log.h"
-#include "opts/opts.h"
+#include "util/opts/log.h"
+#include "util/opts/opts.h"
 
 #include <string.h>
 
diff --git a/opts/log.h b/util/opts/log.h
similarity index 100%
rename from opts/log.h
rename to util/opts/log.h
diff --git a/opts/opts.c b/util/opts/opts.c
similarity index 99%
rename from opts/opts.c
rename to util/opts/opts.c
index c2fd104..5e196a1 100644
--- a/opts/opts.c
+++ b/util/opts/opts.c
@@ -1,5 +1,5 @@
 #include "opts.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/opts/opts.h b/util/opts/opts.h
similarity index 100%
rename from opts/opts.h
rename to util/opts/opts.h