diff --git a/stm-firmware/Makefile b/stm-firmware/Makefile
index 7abb3ed..4ac92ae 100644
--- a/stm-firmware/Makefile
+++ b/stm-firmware/Makefile
@@ -46,10 +46,11 @@ CFILES += ui/lcd.c ui/menu.c reflow-menu.c
 CFILES += fatfs/diskio.c fatfs/ff.c fatfs/ffsystem.c fatfs/ffunicode.c fatfs/shimatta_sdio_driver/shimatta_sdio.c
 CFILES += pid-controller.c oven-driver.c
 CFILES += settings/settings.c settings/settings-sd-card.c
-CFILES += safety-adc.c
+
+CFILES += safety/safety-adc.c
 
 DEBUG_DEFINES = -DDEBUGBUILD
-RELEASE_DEFINES = 
+RELEASE_DEFINES =
 
 ###################################################################################
 ifeq ($(CROSS_COMPILE),)
diff --git a/stm-firmware/include/reflow-controller/safety-adc.h b/stm-firmware/include/reflow-controller/safety/safety-adc.h
similarity index 100%
rename from stm-firmware/include/reflow-controller/safety-adc.h
rename to stm-firmware/include/reflow-controller/safety/safety-adc.h
diff --git a/stm-firmware/main.c b/stm-firmware/main.c
index 3af87db..55c6ae5 100644
--- a/stm-firmware/main.c
+++ b/stm-firmware/main.c
@@ -41,7 +41,7 @@
 #include <stm-periph/uart.h>
 #include <reflow-controller/shell-uart-config.h>
 #include <reflow-controller/oven-driver.h>
-#include <reflow-controller/safety-adc.h>
+#include <reflow-controller/safety/safety-adc.h>
 #include <fatfs/ff.h>
 #include <reflow-controller/reflow-menu.h>
 
diff --git a/stm-firmware/reflow-menu.c b/stm-firmware/reflow-menu.c
index b36d981..253d805 100644
--- a/stm-firmware/reflow-menu.c
+++ b/stm-firmware/reflow-menu.c
@@ -24,7 +24,7 @@
 #include <reflow-controller/rotary-encoder.h>
 #include <reflow-controller/systick.h>
 #include <reflow-controller/adc-meas.h>
-#include <reflow-controller/safety-adc.h>
+#include <reflow-controller/safety/safety-adc.h>
 #include <reflow-controller/temp-converter.h>
 #include <helper-macros/helper-macros.h>
 #include <stm-periph/unique-id.h>
diff --git a/stm-firmware/safety-adc.c b/stm-firmware/safety/safety-adc.c
similarity index 99%
rename from stm-firmware/safety-adc.c
rename to stm-firmware/safety/safety-adc.c
index 52fd448..7467f1f 100644
--- a/stm-firmware/safety-adc.c
+++ b/stm-firmware/safety/safety-adc.c
@@ -18,7 +18,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <reflow-controller/safety-adc.h>
+#include <reflow-controller/safety/safety-adc.h>
 #include <reflow-controller/periph-config/safety-adc-hwcfg.h>
 #include <helper-macros/helper-macros.h>
 #include <stm-periph/clock-enable-manager.h>
diff --git a/stm-firmware/shell.c b/stm-firmware/shell.c
index 599a695..f40a63d 100644
--- a/stm-firmware/shell.c
+++ b/stm-firmware/shell.c
@@ -35,7 +35,7 @@
 #include <fatfs/ff.h>
 #include <reflow-controller/stack-check.h>
 #include <reflow-controller/rotary-encoder.h>
-#include <reflow-controller/safety-adc.h>
+#include <reflow-controller/safety/safety-adc.h>
 
 #ifndef GIT_VER
 #define GIT_VER "VERSION NOT SET"