diff --git a/Makefile b/Makefile
index 6a3e5cd..ceced8b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,13 @@ LDFLAGS ?=
 CC = gcc
 LIBS = -lm -ljpeg -pthread -levent -levent_pthreads -luuid
 override CFLAGS += -c -std=c99 -Wall -Wextra -D_GNU_SOURCE
-SOURCES = $(shell ls src/*.c src/jpeg/*.c src/hw/*.c)
+SOURCES = $(shell ls src/*.c src/encoders/jpeg/*.c src/encoders/hw/*.c)
 OBJECTS = $(SOURCES:.c=.o)
 PROG = ustreamer
 
 
 ifeq ($(shell ls -d /opt/vc/include 2>/dev/null), /opt/vc/include)
-SOURCES += $(shell ls src/omx/*.c)
+SOURCES += $(shell ls src/encoders/omx/*.c)
 LIBS += -lbcm_host -lvcos -lopenmaxil -L/opt/vc/lib
 override CFLAGS += -DOMX_ENCODER -DOMX_SKIP64BIT -I/opt/vc/include
 endif
@@ -59,5 +59,5 @@ push:
 
 clean-all: clean
 clean:
-	rm -f src/*.o src/{jpeg,hw,omx}/*.o vgcore.* *.sock $(PROG)
+	rm -f src/*.o src/encoders/*/*.o vgcore.* *.sock $(PROG)
 	rm -rf pkg src/$(PROG)-* src/v*.tar.gz v*.tar.gz $(PROG)-*.pkg.tar.xz
diff --git a/src/encoder.c b/src/encoder.c
index 284cbe0..d827bbd 100644
--- a/src/encoder.c
+++ b/src/encoder.c
@@ -30,11 +30,11 @@
 #include "device.h"
 #include "encoder.h"
 
-#include "jpeg/encoder.h"
-#include "hw/encoder.h"
+#include "encoders/jpeg/encoder.h"
+#include "encoders/hw/encoder.h"
 
 #ifdef OMX_ENCODER
-#	include "omx/encoder.h"
+#	include "encoders/omx/encoder.h"
 #endif
 
 
diff --git a/src/encoder.h b/src/encoder.h
index c858479..1b1d5d7 100644
--- a/src/encoder.h
+++ b/src/encoder.h
@@ -28,7 +28,7 @@
 #include "device.h"
 
 #ifdef OMX_ENCODER
-#	include "omx/encoder.h"
+#	include "encoders/omx/encoder.h"
 #	define ENCODER_TYPES_OMX_HINT ", OMX"
 #else
 #	define ENCODER_TYPES_OMX_HINT ""
diff --git a/src/hw/encoder.c b/src/encoders/hw/encoder.c
similarity index 96%
rename from src/hw/encoder.c
rename to src/encoders/hw/encoder.c
index f3032c9..e63ecea 100644
--- a/src/hw/encoder.c
+++ b/src/encoders/hw/encoder.c
@@ -25,10 +25,10 @@
 
 #include <linux/videodev2.h>
 
-#include "../tools.h"
-#include "../logging.h"
-#include "../xioctl.h"
-#include "../device.h"
+#include "../../tools.h"
+#include "../../logging.h"
+#include "../../xioctl.h"
+#include "../../device.h"
 
 
 int hw_encoder_prepare_live(struct device_t *dev, unsigned quality) {
diff --git a/src/hw/encoder.h b/src/encoders/hw/encoder.h
similarity index 98%
rename from src/hw/encoder.h
rename to src/encoders/hw/encoder.h
index 6529a20..b498f52 100644
--- a/src/hw/encoder.h
+++ b/src/encoders/hw/encoder.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../device.h"
+#include "../../device.h"
 
 
 int hw_encoder_prepare_live(struct device_t *dev, unsigned quality);
diff --git a/src/jpeg/encoder.c b/src/encoders/jpeg/encoder.c
similarity index 99%
rename from src/jpeg/encoder.c
rename to src/encoders/jpeg/encoder.c
index 030d490..68e183b 100644
--- a/src/jpeg/encoder.c
+++ b/src/encoders/jpeg/encoder.c
@@ -33,8 +33,8 @@
 #include <jpeglib.h>
 #include <linux/videodev2.h>
 
-#include "../tools.h"
-#include "../device.h"
+#include "../../tools.h"
+#include "../../device.h"
 
 #include "encoder.h"
 
diff --git a/src/jpeg/encoder.h b/src/encoders/jpeg/encoder.h
similarity index 98%
rename from src/jpeg/encoder.h
rename to src/encoders/jpeg/encoder.h
index 774cee2..79e8584 100644
--- a/src/jpeg/encoder.h
+++ b/src/encoders/jpeg/encoder.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../device.h"
+#include "../../device.h"
 
 
 void jpeg_encoder_compress_buffer(struct device_t *dev, unsigned index, unsigned quality);
diff --git a/src/omx/component.c b/src/encoders/omx/component.c
similarity index 99%
rename from src/omx/component.c
rename to src/encoders/omx/component.c
index 790b09b..e77014f 100644
--- a/src/omx/component.c
+++ b/src/encoders/omx/component.c
@@ -25,7 +25,7 @@
 #include <IL/OMX_Core.h>
 #include <IL/OMX_Component.h>
 
-#include "../logging.h"
+#include "../../logging.h"
 
 #include "formatters.h"
 #include "component.h"
diff --git a/src/omx/component.h b/src/encoders/omx/component.h
similarity index 100%
rename from src/omx/component.h
rename to src/encoders/omx/component.h
diff --git a/src/omx/encoder.c b/src/encoders/omx/encoder.c
similarity index 99%
rename from src/omx/encoder.c
rename to src/encoders/omx/encoder.c
index 05a4856..a254089 100644
--- a/src/omx/encoder.c
+++ b/src/encoders/omx/encoder.c
@@ -33,9 +33,9 @@
 #include <IL/OMX_Broadcom.h>
 #include <interface/vcos/vcos_semaphore.h>
 
-#include "../logging.h"
-#include "../tools.h"
-#include "../device.h"
+#include "../../logging.h"
+#include "../../tools.h"
+#include "../../device.h"
 
 #include "formatters.h"
 #include "component.h"
diff --git a/src/omx/encoder.h b/src/encoders/omx/encoder.h
similarity index 98%
rename from src/omx/encoder.h
rename to src/encoders/omx/encoder.h
index c8f61b5..828300f 100644
--- a/src/omx/encoder.h
+++ b/src/encoders/omx/encoder.h
@@ -27,7 +27,7 @@
 #include <IL/OMX_Component.h>
 #include <interface/vcos/vcos_semaphore.h>
 
-#include "../device.h"
+#include "../../device.h"
 
 
 #define OMX_MAX_ENCODERS 3
diff --git a/src/omx/formatters.c b/src/encoders/omx/formatters.c
similarity index 99%
rename from src/omx/formatters.c
rename to src/encoders/omx/formatters.c
index 0f38e3e..cc06e4f 100644
--- a/src/omx/formatters.c
+++ b/src/encoders/omx/formatters.c
@@ -26,7 +26,7 @@
 #include <IL/OMX_IVCommon.h>
 #include <IL/OMX_Core.h>
 
-#include "../tools.h"
+#include "../../tools.h"
 #include "formatters.h"
 
 
diff --git a/src/omx/formatters.h b/src/encoders/omx/formatters.h
similarity index 97%
rename from src/omx/formatters.h
rename to src/encoders/omx/formatters.h
index 7e86cc5..6f98f3a 100644
--- a/src/omx/formatters.h
+++ b/src/encoders/omx/formatters.h
@@ -30,8 +30,8 @@
 #include <IL/OMX_Core.h>
 #include <IL/OMX_Image.h>
 
-#include "../logging.h"
-#include "../tools.h"
+#include "../../logging.h"
+#include "../../tools.h"
 
 
 #define LOG_OMX_ERROR(_error, _msg, ...) { \
diff --git a/src/stream.c b/src/stream.c
index c91168b..277d577 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -36,8 +36,6 @@
 #include "encoder.h"
 #include "stream.h"
 
-#include "jpeg/encoder.h"
-
 
 static long double _stream_get_fluency_delay(struct device_t *dev, struct workers_pool_t *pool);
 static void _stream_expose_picture(struct stream_t *stream, unsigned buf_index);