qmk · Erovia · Jun 21, 2021 · May 30, 2021 · Jun 7, 2021 · Jun 16, 2021
diff --git a/keyboards/ploopyco/adns5050.c → drivers/sensors/adns5050.c b/keyboards/ploopyco/adns5050.c → drivers/sensors/adns5050.c
diff --git a/keyboards/ploopyco/adns5050.h → drivers/sensors/adns5050.h b/keyboards/ploopyco/adns5050.h → drivers/sensors/adns5050.h
diff --git a/keyboards/oddball/adns/adns.c → drivers/sensors/adns9800.c b/keyboards/oddball/adns/adns.c → drivers/sensors/adns9800.c
@@ -17,7 +17,7 @@
 #include "spi_master.h"
 #include "quantum.h"
 #include "adns9800_srom_A6.h"
-#include "adns.h"
+#include "adns9800.h"
 
 // registers
 #define REG_Product_ID                           0x00

diff --git a/keyboards/oddball/adns/adns.h → drivers/sensors/adns9800.h b/keyboards/oddball/adns/adns.h → drivers/sensors/adns9800.h
diff --git a/keyboards/oddball/adns/adns9800_srom_A6.h → drivers/sensors/adns9800_srom_A6.h b/keyboards/oddball/adns/adns9800_srom_A6.h → drivers/sensors/adns9800_srom_A6.h
diff --git a/keyboards/ploopyco/pmw3360.c → drivers/sensors/pmw3360.c b/keyboards/ploopyco/pmw3360.c → drivers/sensors/pmw3360.c
diff --git a/...yl_manuform/5x6_right_trackball/pmw3360.h → drivers/sensors/pmw3360.h b/...yl_manuform/5x6_right_trackball/pmw3360.h → drivers/sensors/pmw3360.h
diff --git a/...rm/5x6_right_trackball/pmw3360_firmware.h → drivers/sensors/pmw3360_firmware.h b/...rm/5x6_right_trackball/pmw3360_firmware.h → drivers/sensors/pmw3360_firmware.h
diff --git a/keyboards/handwired/dactyl_manuform/5x6_right_trackball/5x6_right_trackball.h b/keyboards/handwired/dactyl_manuform/5x6_right_trackball/5x6_right_trackball.h
@@ -19,7 +19,7 @@
 #include "dactyl_manuform.h"
 #include "quantum.h"
 #include "spi_master.h"
-#include "pmw3360.h"
+#include "drivers/sensors/pmw3360.h"
 #include "pointing_device.h"
 
 

diff --git a/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c b/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c
diff --git a/keyboards/handwired/dactyl_manuform/5x6_right_trackball/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_right_trackball/rules.mk
@@ -27,5 +27,5 @@ MOUSE_SHARED_EP = no
 SPLIT_KEYBOARD = yes
 SPLIT_TRANSPORT = custom
 
-SRC += pmw3360.c
+SRC += drivers/sensors/pmw3360.c
 QUANTUM_LIB_SRC += pointer_transport.c serial.c i2c_master.c i2c_slave.c spi_master.c
diff --git a/keyboards/oddball/optical_sensor/optical_sensor.h b/keyboards/oddball/optical_sensor/optical_sensor.h
@@ -17,7 +17,7 @@
 /* common interface for opitcal sensors */
 
 #if defined ADNS_9800
-    #include "../adns/adns.h"
+    #include "drivers/sensors/adns9800.h"
     #define config_optical_sensor_t config_adns_t
     #define report_optical_sensor_t report_adns_t
     #define optical_sensor_init adns_init

diff --git a/keyboards/oddball/rules.mk b/keyboards/oddball/rules.mk
@@ -25,5 +25,5 @@ POINTING_DEVICE_ENABLE = yes
 DEFAULT_FOLDER = oddball/v1
 
 SRC += spi_master.c
-SRC += adns/adns.c
+SRC += drivers/sensors/adns9800.c
 SRC += pmw/pmw.c
diff --git a/keyboards/ploopyco/mouse/mouse.h b/keyboards/ploopyco/mouse/mouse.h
@@ -20,7 +20,7 @@
 
 #include "quantum.h"
 #include "spi_master.h"
-#include "pmw3360.h"
+#include "drivers/sensors/pmw3360.h"
 #include "analog.h"
 #include "opt_encoder.h"
 #include "pointing_device.h"

diff --git a/keyboards/ploopyco/mouse/rules.mk b/keyboards/ploopyco/mouse/rules.mk
@@ -27,4 +27,4 @@ POINTING_DEVICE_ENABLE = yes
 MOUSEKEY_ENABLE = yes       # Mouse keys
 
 QUANTUM_LIB_SRC += analog.c spi_master.c
-SRC += pmw3360.c opt_encoder.c
+SRC += drivers/sensors/pmw3360.c opt_encoder.c
diff --git a/keyboards/ploopyco/pmw3360.h b/keyboards/ploopyco/pmw3360.h