diff --git a/boards/base/Embest-STM32-DMSTF4BB/ChibiOS_Board/EMBEST_DMSTF4BB.zip b/boards/base/Embest-STM32-DMSTF4BB/ChibiOS_Board/EMBEST_DMSTF4BB.zip
deleted file mode 100644
index 47e0cc8a..00000000
Binary files a/boards/base/Embest-STM32-DMSTF4BB/ChibiOS_Board/EMBEST_DMSTF4BB.zip and /dev/null differ
diff --git a/boards/base/Embest-STM32-DMSTF4BB/ChibiOS_Board/EMBEST_DMSTF4BB/board.c b/boards/base/Embest-STM32-DMSTF4BB/chibios_board/board.c
similarity index 100%
rename from boards/base/Embest-STM32-DMSTF4BB/ChibiOS_Board/EMBEST_DMSTF4BB/board.c
rename to boards/base/Embest-STM32-DMSTF4BB/chibios_board/board.c
diff --git a/boards/base/Embest-STM32-DMSTF4BB/ChibiOS_Board/EMBEST_DMSTF4BB/board.h b/boards/base/Embest-STM32-DMSTF4BB/chibios_board/board.h
similarity index 100%
rename from boards/base/Embest-STM32-DMSTF4BB/ChibiOS_Board/EMBEST_DMSTF4BB/board.h
rename to boards/base/Embest-STM32-DMSTF4BB/chibios_board/board.h
diff --git a/boards/base/Embest-STM32-DMSTF4BB/ChibiOS_Board/EMBEST_DMSTF4BB/board.mk b/boards/base/Embest-STM32-DMSTF4BB/chibios_board/board.mk
similarity index 100%
rename from boards/base/Embest-STM32-DMSTF4BB/ChibiOS_Board/EMBEST_DMSTF4BB/board.mk
rename to boards/base/Embest-STM32-DMSTF4BB/chibios_board/board.mk
diff --git a/boards/base/Embest-STM32-DMSTF4BB/ChibiOS_Board/EMBEST_DMSTF4BB/cfg/board.chcfg b/boards/base/Embest-STM32-DMSTF4BB/chibios_board/cfg/board.chcfg
similarity index 100%
rename from boards/base/Embest-STM32-DMSTF4BB/ChibiOS_Board/EMBEST_DMSTF4BB/cfg/board.chcfg
rename to boards/base/Embest-STM32-DMSTF4BB/chibios_board/cfg/board.chcfg