diff --git a/ports/stm32/gchelper_m0.s b/lib/utils/gchelper_m0.s
similarity index 100%
rename from ports/stm32/gchelper_m0.s
rename to lib/utils/gchelper_m0.s
diff --git a/ports/stm32/gchelper.s b/lib/utils/gchelper_m3.s
similarity index 100%
rename from ports/stm32/gchelper.s
rename to lib/utils/gchelper_m3.s
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index ee4de61cc..c7dc99fd7 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -275,13 +275,13 @@ SRC_O = \
 	$(STARTUP_FILE) \
 	system_stm32f0.o \
 	resethandler_m0.o \
-	gchelper_m0.o
+	lib/utils/gchelper_m0.o
 else
 SRC_O = \
 	$(STARTUP_FILE) \
 	system_stm32.o \
 	resethandler.o \
-	gchelper.o
+	lib/utils/gchelper_m3.o
 endif
 
 SRC_HAL = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\