diff --git a/boards/auav/x21/default.cmake b/boards/auav/x21/default.cmake
index 6b55c0817d78956ecadb0c64fa7f95f0b8754bff..dcef387ebf70c2dbd7181e2e32a5d7e010ebd976 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 9b4cd73f73d953e348e27515594d7039119ee2b7..5c02b0857f09b63cfad6ec5f860fb8c0017dec44 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 bef94d9d544271e314538ed3b874ee00e2ae1286..0a6e9b99e2b4569dd9f6225dcb6a7221fc43864d 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 7385ff69a5a0475aed77a66193ec25b02c3980b4..c19349fc67c79d2251238446ca311d14afded712 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 c978c54eecec1dea31373659056e004426f93f69..62ed450c8ef9adfecc6d31b2c6b0d74a02542d5b 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 4e4ab3f5d719679042892f38cfd3bd37a4917a03..82001a3423fb7f78290a8d577ff0f9b76e829243 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 7ac4b421fa976596ec337059e16d145165dfc35f..95ba864caa87614fbc4879dbb8c080ca83ce68b9 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 f8e2d4643de209b59109ec1ec89b2029373854ea..821d39a0e97ab6778188ac851fcb638930a72eba 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 9a4e8f3e6a9d22d11e289058db636bcf3cff6ec9..3d0916f88cd620590efd37957bef9d706be2191a 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 e62b24f225b4acbfac33b2259f44390919212323..ebe2e879f78543940de676d5484ca90cc2088cca 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 c2de53a0fc8aa3147b09b0e67614f927e30a2396..7362d57d2dc5ae499e9576dc7e52405c65a10b47 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 931a859739b23274f1d507766784ed8c10fa11d7..19bff3c7fd0ed32dddeb14c58ca08dbc151a425f 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 f80c47a6fbd470823ab7534425f9b06da9bbda7c..d746e83c61054a9d3305f78fcc1df33ef3698bdb 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 77c3960151051b178c9ca8cfb7adc75d4e227b78..de66d2ef643d8994b7768d48b0bea07168e2b6c5 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