diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
index 54f4753..7d692d2 100644
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -37,3 +37,7 @@ jobs:
       - name: Build Digital Inputs Firmware
         working-directory: ./digital-inputs/firmware
         run: make
+
+      - name: Build SENT Firmware
+        working-directory: ./SENT-box/firmware
+        run: make
diff --git a/SENT-box/Makefile b/SENT-box/firmware/Makefile
similarity index 99%
rename from SENT-box/Makefile
rename to SENT-box/firmware/Makefile
index 8413962..fe18c06 100644
--- a/SENT-box/Makefile
+++ b/SENT-box/firmware/Makefile
@@ -90,7 +90,7 @@ PROJECT = ch
 MCU  = cortex-m3
 
 # Imported source files and paths.
-CHIBIOS = ../ChibiOS
+CHIBIOS = ../../ChibiOS
 CONFDIR  := ./cfg
 BUILDDIR := ./build
 DEPDIR   := ./.dep
diff --git a/SENT-box/can.cpp b/SENT-box/firmware/can.cpp
similarity index 100%
rename from SENT-box/can.cpp
rename to SENT-box/firmware/can.cpp
diff --git a/SENT-box/can.h b/SENT-box/firmware/can.h
similarity index 100%
rename from SENT-box/can.h
rename to SENT-box/firmware/can.h
diff --git a/SENT-box/chconf.h b/SENT-box/firmware/chconf.h
similarity index 100%
rename from SENT-box/chconf.h
rename to SENT-box/firmware/chconf.h
diff --git a/SENT-box/clean_build.bat b/SENT-box/firmware/clean_build.bat
similarity index 100%
rename from SENT-box/clean_build.bat
rename to SENT-box/firmware/clean_build.bat
diff --git a/SENT-box/compile.bat b/SENT-box/firmware/compile.bat
similarity index 100%
rename from SENT-box/compile.bat
rename to SENT-box/firmware/compile.bat
diff --git a/SENT-box/flash.bat b/SENT-box/firmware/flash.bat
similarity index 100%
rename from SENT-box/flash.bat
rename to SENT-box/firmware/flash.bat
diff --git a/SENT-box/halconf.h b/SENT-box/firmware/halconf.h
similarity index 100%
rename from SENT-box/halconf.h
rename to SENT-box/firmware/halconf.h
diff --git a/SENT-box/main.cpp b/SENT-box/firmware/main.cpp
similarity index 100%
rename from SENT-box/main.cpp
rename to SENT-box/firmware/main.cpp
diff --git a/SENT-box/mcuconf.h b/SENT-box/firmware/mcuconf.h
similarity index 100%
rename from SENT-box/mcuconf.h
rename to SENT-box/firmware/mcuconf.h
diff --git a/SENT-box/uart.cpp b/SENT-box/firmware/uart.cpp
similarity index 100%
rename from SENT-box/uart.cpp
rename to SENT-box/firmware/uart.cpp
diff --git a/SENT-box/uart.h b/SENT-box/firmware/uart.h
similarity index 100%
rename from SENT-box/uart.h
rename to SENT-box/firmware/uart.h