diff --git a/nx/Makefile b/nx/Makefile
index f90c942d..330d3366 100644
--- a/nx/Makefile
+++ b/nx/Makefile
@@ -24,7 +24,7 @@ VERSION	:=	$(LIBNX_MAJOR).$(LIBNX_MINOR).$(LIBNX_PATCH)
 #---------------------------------------------------------------------------------
 TARGET		:=	nx
 #BUILD		:=	build
-SOURCES		:=	source/arm source/system source/kernel source/services source/gfx source/gfx/ioctl source/devices source/util/utf
+SOURCES		:=	source/arm source/runtime source/kernel source/runtime/devices source/services source/gfx source/gfx/ioctl source/util/utf
 DATA		:=	data
 INCLUDES	:=	include
 
diff --git a/nx/source/devices/console.c b/nx/source/runtime/devices/console.c
similarity index 100%
rename from nx/source/devices/console.c
rename to nx/source/runtime/devices/console.c
diff --git a/nx/source/devices/fs_dev.c b/nx/source/runtime/devices/fs_dev.c
similarity index 100%
rename from nx/source/devices/fs_dev.c
rename to nx/source/runtime/devices/fs_dev.c
diff --git a/nx/source/devices/usb_comms.c b/nx/source/runtime/devices/usb_comms.c
similarity index 100%
rename from nx/source/devices/usb_comms.c
rename to nx/source/runtime/devices/usb_comms.c
diff --git a/nx/source/system/dynamic.c b/nx/source/runtime/dynamic.c
similarity index 100%
rename from nx/source/system/dynamic.c
rename to nx/source/runtime/dynamic.c
diff --git a/nx/source/system/init.c b/nx/source/runtime/init.c
similarity index 100%
rename from nx/source/system/init.c
rename to nx/source/runtime/init.c
diff --git a/nx/source/system/initArgv.c b/nx/source/runtime/initArgv.c
similarity index 100%
rename from nx/source/system/initArgv.c
rename to nx/source/runtime/initArgv.c
diff --git a/nx/source/system/newlib.c b/nx/source/runtime/newlib.c
similarity index 100%
rename from nx/source/system/newlib.c
rename to nx/source/runtime/newlib.c
diff --git a/nx/source/system/readtp.s b/nx/source/runtime/readtp.s
similarity index 100%
rename from nx/source/system/readtp.s
rename to nx/source/runtime/readtp.s