diff --git a/boards/auav/x21/default.cmake b/boards/auav/x21/default.cmake
index 6b55c0817d7..dcef387ebf7 100644
--- a/boards/auav/x21/default.cmake
+++ b/boards/auav/x21/default.cmake
@@ -34,7 +34,7 @@ px4_add_board(
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		pca8574
+		lights/pca8574
 		pca9685
 		#pmw3901
 		protocol_splitter
diff --git a/boards/av/x-v1/default.cmake b/boards/av/x-v1/default.cmake
index 9b4cd73f73d..5c02b0857f0 100644
--- a/boards/av/x-v1/default.cmake
+++ b/boards/av/x-v1/default.cmake
@@ -34,7 +34,7 @@ px4_add_board(
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		#pca8574
+		#lights/pca8574
 		pca9685
 		#pmw3901
 		protocol_splitter
diff --git a/boards/gumstix/aerocore2/default.cmake b/boards/gumstix/aerocore2/default.cmake
index bef94d9d544..0a6e9b99e2b 100644
--- a/boards/gumstix/aerocore2/default.cmake
+++ b/boards/gumstix/aerocore2/default.cmake
@@ -32,7 +32,7 @@ px4_add_board(
 		#magnetometer # all available magnetometer drivers
 		#md25
 		#mkblctrl
-		#pca8574
+		#lights/pca8574
 		#pca9685
 		#pmw3901
 		#protocol_splitter
diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake
index 7385ff69a5a..c19349fc67c 100644
--- a/boards/px4/fmu-v3/default.cmake
+++ b/boards/px4/fmu-v3/default.cmake
@@ -42,7 +42,7 @@ px4_add_board(
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		pca8574
+		lights/pca8574
 		pca9685
 		#pmw3901
 		protocol_splitter
diff --git a/boards/px4/fmu-v3/rtps.cmake b/boards/px4/fmu-v3/rtps.cmake
index c978c54eece..62ed450c8ef 100644
--- a/boards/px4/fmu-v3/rtps.cmake
+++ b/boards/px4/fmu-v3/rtps.cmake
@@ -42,7 +42,7 @@ px4_add_board(
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		pca8574
+		lights/pca8574
 		pca9685
 		#pmw3901
 		protocol_splitter
diff --git a/boards/px4/fmu-v3/stackcheck.cmake b/boards/px4/fmu-v3/stackcheck.cmake
index 4e4ab3f5d71..82001a3423f 100644
--- a/boards/px4/fmu-v3/stackcheck.cmake
+++ b/boards/px4/fmu-v3/stackcheck.cmake
@@ -39,7 +39,7 @@ px4_add_board(
 		#md25
 		mkblctrl
 		lights/oreoled
-		pca8574
+		lights/pca8574
 		pca9685
 		#pmw3901
 		protocol_splitter
diff --git a/boards/px4/fmu-v4pro/default.cmake b/boards/px4/fmu-v4pro/default.cmake
index 7ac4b421fa9..95ba864caa8 100644
--- a/boards/px4/fmu-v4pro/default.cmake
+++ b/boards/px4/fmu-v4pro/default.cmake
@@ -41,7 +41,7 @@ px4_add_board(
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		pca8574
+		lights/pca8574
 		pca9685
 		#pmw3901
 		#protocol_splitter
diff --git a/boards/px4/fmu-v4pro/rtps.cmake b/boards/px4/fmu-v4pro/rtps.cmake
index f8e2d4643de..821d39a0e97 100644
--- a/boards/px4/fmu-v4pro/rtps.cmake
+++ b/boards/px4/fmu-v4pro/rtps.cmake
@@ -41,7 +41,7 @@ px4_add_board(
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		pca8574
+		lights/pca8574
 		pca9685
 		#pmw3901
 		protocol_splitter
diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake
index 9a4e8f3e6a9..3d0916f88cd 100644
--- a/boards/px4/fmu-v5/default.cmake
+++ b/boards/px4/fmu-v5/default.cmake
@@ -40,7 +40,7 @@ px4_add_board(
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		pca8574
+		lights/pca8574
 		pca9685
 		pmw3901
 		#protocol_splitter
diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake
index e62b24f225b..ebe2e879f78 100644
--- a/boards/px4/fmu-v5/rtps.cmake
+++ b/boards/px4/fmu-v5/rtps.cmake
@@ -41,7 +41,7 @@ px4_add_board(
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		pca8574
+		lights/pca8574
 		pca9685
 		pmw3901
 		protocol_splitter
diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake
index c2de53a0fc8..7362d57d2dc 100644
--- a/boards/px4/fmu-v5/stackcheck.cmake
+++ b/boards/px4/fmu-v5/stackcheck.cmake
@@ -38,7 +38,7 @@ px4_add_board(
 		#md25
 		mkblctrl
 		lights/oreoled
-		pca8574
+		lights/pca8574
 		pca9685
 		pmw3901
 		protocol_splitter
diff --git a/boards/stm/nucleo-F767ZI/default.cmake b/boards/stm/nucleo-F767ZI/default.cmake
index 931a859739b..19bff3c7fd0 100644
--- a/boards/stm/nucleo-F767ZI/default.cmake
+++ b/boards/stm/nucleo-F767ZI/default.cmake
@@ -28,7 +28,7 @@ px4_add_board(
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		pca8574
+		lights/pca8574
 		pca9685
 		#pmw3901
 		protocol_splitter
diff --git a/src/drivers/lights/CMakeLists.txt b/src/drivers/lights/CMakeLists.txt
index f80c47a6fbd..d746e83c610 100644
--- a/src/drivers/lights/CMakeLists.txt
+++ b/src/drivers/lights/CMakeLists.txt
@@ -32,6 +32,8 @@
 ############################################################################
 
 add_subdirectory(blinkm)
+add_subdirectory(oreoled
+add_subdirectory(pca8574)
 add_subdirectory(rgbled)
 add_subdirectory(rgbled_ncp5623c)
 add_subdirectory(rgbled_pwm)
diff --git a/src/drivers/pca8574/CMakeLists.txt b/src/drivers/lights/pca8574/CMakeLists.txt
similarity index 99%
rename from src/drivers/pca8574/CMakeLists.txt
rename to src/drivers/lights/pca8574/CMakeLists.txt
index 77c39601510..de66d2ef643 100644
--- a/src/drivers/pca8574/CMakeLists.txt
+++ b/src/drivers/lights/pca8574/CMakeLists.txt
@@ -38,4 +38,3 @@ px4_add_module(
 		pca8574.cpp
 	DEPENDS
 	)
-
diff --git a/src/drivers/pca8574/pca8574.cpp b/src/drivers/lights/pca8574/pca8574.cpp
similarity index 100%
rename from src/drivers/pca8574/pca8574.cpp
rename to src/drivers/lights/pca8574/pca8574.cpp