diff --git a/nrf5/Makefile b/nrf5/Makefile
index 605f1d385f..cd7bad669a 100644
--- a/nrf5/Makefile
+++ b/nrf5/Makefile
@@ -61,6 +61,7 @@ INC += -I./device/$(MCU_VARIANT)
 INC += -I./hal
 INC += -I./hal/$(MCU_VARIANT)
 INC += -I./modules/display
+INC += -I./modules/machine
 INC += -I../lib/mp-readline
 
 NRF_DEFINES += -D$(MCU_VARIANT_UPPER)
@@ -136,7 +137,6 @@ SRC_C += \
 	help.c \
 	gccollect.c \
 	pin_named_pins.c \
-	modmachine.c \
 	pin.c \
 	modutime.c \
 	moduos.c \
@@ -164,6 +164,7 @@ DRIVERS_SRC_C += $(addprefix modules/,\
 	display/oled_ssd1306_driver.c \
 	display/framebuffer.c \
 	graphic/draw.c \
+	machine/modmachine.c \
 	)
 
 #ifeq ($(SD), )
diff --git a/nrf5/modmachine.c b/nrf5/modules/machine/modmachine.c
similarity index 100%
rename from nrf5/modmachine.c
rename to nrf5/modules/machine/modmachine.c
diff --git a/nrf5/modmachine.h b/nrf5/modules/machine/modmachine.h
similarity index 100%
rename from nrf5/modmachine.h
rename to nrf5/modules/machine/modmachine.h