diff --git a/src/Makefile b/src/Makefile
index e56f508..ac5897a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,7 +23,7 @@ _USTR_SRCS = $(shell ls \
 	ustreamer/data/*.c \
 	ustreamer/encoders/cpu/*.c \
 	ustreamer/encoders/hw/*.c \
-	ustreamer/h264/*.c \
+	ustreamer/*.c \
 )
 
 _DUMP_LIBS = $(_COMMON_LIBS)
diff --git a/src/ustreamer/h264/stream.c b/src/ustreamer/h264.c
similarity index 99%
rename from src/ustreamer/h264/stream.c
rename to src/ustreamer/h264.c
index 2b6bf9a..d4fc47b 100644
--- a/src/ustreamer/h264/stream.c
+++ b/src/ustreamer/h264.c
@@ -20,7 +20,7 @@
 *****************************************************************************/
 
 
-#include "stream.h"
+#include "h264.h"
 
 
 us_h264_stream_s *us_h264_stream_init(us_memsink_s *sink, const char *path, unsigned bitrate, unsigned gop) {
diff --git a/src/ustreamer/h264/stream.h b/src/ustreamer/h264.h
similarity index 92%
rename from src/ustreamer/h264/stream.h
rename to src/ustreamer/h264.h
index c68a642..2729228 100644
--- a/src/ustreamer/h264/stream.h
+++ b/src/ustreamer/h264.h
@@ -26,12 +26,12 @@
 #include <stdatomic.h>
 #include <assert.h>
 
-#include "../../libs/tools.h"
-#include "../../libs/logging.h"
-#include "../../libs/frame.h"
-#include "../../libs/memsink.h"
-#include "../../libs/unjpeg.h"
-#include "../m2m.h"
+#include "../libs/tools.h"
+#include "../libs/logging.h"
+#include "../libs/frame.h"
+#include "../libs/memsink.h"
+#include "../libs/unjpeg.h"
+#include "m2m.h"
 
 
 typedef struct {
diff --git a/src/ustreamer/stream.h b/src/ustreamer/stream.h
index 05e65a3..02501d2 100644
--- a/src/ustreamer/stream.h
+++ b/src/ustreamer/stream.h
@@ -42,7 +42,7 @@
 #include "device.h"
 #include "encoder.h"
 #include "workers.h"
-#include "h264/stream.h"
+#include "h264.h"
 #ifdef WITH_GPIO
 #	include "gpio/gpio.h"
 #endif