diff --git a/targets/arduino.json b/targets/arduino.json
index a490c825..1890b9ee 100644
--- a/targets/arduino.json
+++ b/targets/arduino.json
@@ -2,5 +2,5 @@
 	"llvm-target": "avr-atmel-none",
 	"build-tags": ["avr", "avr8", "atmega", "atmega328p", "js", "wasm"],
 	"linker": "avr-gcc",
-	"pre-link-args": ["-nostdlib", "-T", "avr.ld", "-Wl,--gc-sections", "avr.S"]
+	"pre-link-args": ["-nostdlib", "-T", "targets/avr.ld", "-Wl,--gc-sections", "targets/avr.S"]
 }
diff --git a/arm.ld b/targets/arm.ld
similarity index 100%
rename from arm.ld
rename to targets/arm.ld
diff --git a/avr.S b/targets/avr.S
similarity index 100%
rename from avr.S
rename to targets/avr.S
diff --git a/avr.ld b/targets/avr.ld
similarity index 100%
rename from avr.ld
rename to targets/avr.ld
diff --git a/targets/pca10040.json b/targets/pca10040.json
index 54eed5e4..cc17d784 100644
--- a/targets/pca10040.json
+++ b/targets/pca10040.json
@@ -2,5 +2,5 @@
 	"llvm-target": "armv7m-none-eabi",
 	"build-tags": ["nrf", "nrf52", "nrf52832", "js", "wasm"],
 	"linker": "arm-none-eabi-gcc",
-	"pre-link-args": ["-nostdlib", "-nostartfiles", "-mcpu=cortex-m4", "-mthumb", "-T", "arm.ld", "-Wl,--gc-sections", "-fno-exceptions", "-fno-unwind-tables", "-ffunction-sections", "-fdata-sections", "-Os", "-DNRF52832_XXAA", "-D__STARTUP_CLEAR_BSS", "-Ilib/CMSIS/CMSIS/Include", "lib/nrfx/mdk/gcc_startup_nrf51.S", "lib/nrfx/mdk/system_nrf52.c"]
+	"pre-link-args": ["-nostdlib", "-nostartfiles", "-mcpu=cortex-m4", "-mthumb", "-T", "targets/arm.ld", "-Wl,--gc-sections", "-fno-exceptions", "-fno-unwind-tables", "-ffunction-sections", "-fdata-sections", "-Os", "-DNRF52832_XXAA", "-D__STARTUP_CLEAR_BSS", "-Ilib/CMSIS/CMSIS/Include", "lib/nrfx/mdk/gcc_startup_nrf51.S", "lib/nrfx/mdk/system_nrf52.c"]
 }