diff --git a/src/Makefile b/src/Makefile
index 488c2c5d..abd86932 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
 PROBE_HOST ?= native
 PLATFORM_DIR = platforms/$(PROBE_HOST)
-VPATH += $(PLATFORM_DIR) platforms/common
+VPATH += $(PLATFORM_DIR) platforms/common target
 ENABLE_DEBUG ?=
 
 ifneq ($(V), 1)
diff --git a/src/adiv5.c b/src/target/adiv5.c
similarity index 100%
rename from src/adiv5.c
rename to src/target/adiv5.c
diff --git a/src/include/adiv5.h b/src/target/adiv5.h
similarity index 100%
rename from src/include/adiv5.h
rename to src/target/adiv5.h
diff --git a/src/adiv5_jtagdp.c b/src/target/adiv5_jtagdp.c
similarity index 100%
rename from src/adiv5_jtagdp.c
rename to src/target/adiv5_jtagdp.c
diff --git a/src/adiv5_swdp.c b/src/target/adiv5_swdp.c
similarity index 100%
rename from src/adiv5_swdp.c
rename to src/target/adiv5_swdp.c
diff --git a/src/cortexa.c b/src/target/cortexa.c
similarity index 100%
rename from src/cortexa.c
rename to src/target/cortexa.c
diff --git a/src/cortexm.c b/src/target/cortexm.c
similarity index 100%
rename from src/cortexm.c
rename to src/target/cortexm.c
diff --git a/src/include/cortexm.h b/src/target/cortexm.h
similarity index 100%
rename from src/include/cortexm.h
rename to src/target/cortexm.h
diff --git a/src/efm32.c b/src/target/efm32.c
similarity index 100%
rename from src/efm32.c
rename to src/target/efm32.c
diff --git a/src/jtag_scan.c b/src/target/jtag_scan.c
similarity index 100%
rename from src/jtag_scan.c
rename to src/target/jtag_scan.c
diff --git a/src/include/jtag_scan.h b/src/target/jtag_scan.h
similarity index 100%
rename from src/include/jtag_scan.h
rename to src/target/jtag_scan.h
diff --git a/src/jtagtap_generic.c b/src/target/jtagtap_generic.c
similarity index 100%
rename from src/jtagtap_generic.c
rename to src/target/jtagtap_generic.c
diff --git a/src/kinetis.c b/src/target/kinetis.c
similarity index 100%
rename from src/kinetis.c
rename to src/target/kinetis.c
diff --git a/src/lmi.c b/src/target/lmi.c
similarity index 100%
rename from src/lmi.c
rename to src/target/lmi.c
diff --git a/src/lpc11xx.c b/src/target/lpc11xx.c
similarity index 100%
rename from src/lpc11xx.c
rename to src/target/lpc11xx.c
diff --git a/src/lpc15xx.c b/src/target/lpc15xx.c
similarity index 100%
rename from src/lpc15xx.c
rename to src/target/lpc15xx.c
diff --git a/src/lpc43xx.c b/src/target/lpc43xx.c
similarity index 100%
rename from src/lpc43xx.c
rename to src/target/lpc43xx.c
diff --git a/src/lpc_common.c b/src/target/lpc_common.c
similarity index 100%
rename from src/lpc_common.c
rename to src/target/lpc_common.c
diff --git a/src/include/lpc_common.h b/src/target/lpc_common.h
similarity index 100%
rename from src/include/lpc_common.h
rename to src/target/lpc_common.h
diff --git a/src/nrf51.c b/src/target/nrf51.c
similarity index 100%
rename from src/nrf51.c
rename to src/target/nrf51.c
diff --git a/src/sam3x.c b/src/target/sam3x.c
similarity index 100%
rename from src/sam3x.c
rename to src/target/sam3x.c
diff --git a/src/samd.c b/src/target/samd.c
similarity index 100%
rename from src/samd.c
rename to src/target/samd.c
diff --git a/src/stm32f1.c b/src/target/stm32f1.c
similarity index 100%
rename from src/stm32f1.c
rename to src/target/stm32f1.c
diff --git a/src/stm32f4.c b/src/target/stm32f4.c
similarity index 100%
rename from src/stm32f4.c
rename to src/target/stm32f4.c
diff --git a/src/stm32l0.c b/src/target/stm32l0.c
similarity index 100%
rename from src/stm32l0.c
rename to src/target/stm32l0.c
diff --git a/src/stm32l4.c b/src/target/stm32l4.c
similarity index 100%
rename from src/stm32l4.c
rename to src/target/stm32l4.c
diff --git a/src/swdptap_generic.c b/src/target/swdptap_generic.c
similarity index 100%
rename from src/swdptap_generic.c
rename to src/target/swdptap_generic.c
diff --git a/src/target.c b/src/target/target.c
similarity index 100%
rename from src/target.c
rename to src/target/target.c
diff --git a/src/target_internal.h b/src/target/target_internal.h
similarity index 100%
rename from src/target_internal.h
rename to src/target/target_internal.h