diff --git a/driver/battery/ryu.c b/board/ryu/battery.c
similarity index 100%
rename from driver/battery/ryu.c
rename to board/ryu/battery.c
diff --git a/board/ryu/build.mk b/board/ryu/build.mk
index 7d6e69851d..a4b97412b0 100644
--- a/board/ryu/build.mk
+++ b/board/ryu/build.mk
@@ -9,5 +9,5 @@ CHIP:=stm32
 CHIP_FAMILY:=stm32f3
 CHIP_VARIANT:=stm32f373
 
-board-y=board.o
+board-y=battery.o board.o
 board-$(CONFIG_USB_POWER_DELIVERY)+=usb_mux.o usb_pd_policy.o
diff --git a/driver/battery/samus.c b/board/samus/battery.c
similarity index 100%
rename from driver/battery/samus.c
rename to board/samus/battery.c
diff --git a/board/samus/build.mk b/board/samus/build.mk
index 153a280b76..2ff7e66d94 100644
--- a/board/samus/build.mk
+++ b/board/samus/build.mk
@@ -9,4 +9,4 @@
 # the IC is TI Stellaris LM4
 CHIP:=lm4
 
-board-y=board.o power_sequence.o panel.o extpower.o
+board-y=battery.o board.o power_sequence.o panel.o extpower.o
diff --git a/driver/build.mk b/driver/build.mk
index cfa8781fc4..1458874864 100644
--- a/driver/build.mk
+++ b/driver/build.mk
@@ -26,8 +26,6 @@ driver-$(CONFIG_ALS_SI114X)+=als_si114x.o
 driver-$(CONFIG_BATTERY_BQ20Z453)+=battery/bq20z453.o
 driver-$(CONFIG_BATTERY_BQ27541)+=battery/bq27541.o
 driver-$(CONFIG_BATTERY_BQ27621)+=battery/bq27621_g1.o
-driver-$(CONFIG_BATTERY_RYU)+=battery/ryu.o
-driver-$(CONFIG_BATTERY_SAMUS)+=battery/samus.o
 driver-$(CONFIG_BATTERY_SMART)+=battery/smart.o
 
 # Battery charger ICs