diff --git a/Makefile b/Makefile
index b3ce916e5..cfac5dcb0 100644
--- a/Makefile
+++ b/Makefile
@@ -41,10 +41,10 @@ SOURCES = \
 
 SOURCES_STM32F4 = \
 	third-party/STM32F4-Discovery_FW_V1.1.0/Libraries/CMSIS/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c \
-        $(wildcard src/libruntime/stm32f4/*)
+        $(wildcard src/libruntime/target/stm32f4/*)
 
 SOURCES_LINUX = \
-        $(wildcard src/libruntime/linux/*)
+        $(wildcard src/libruntime/target/linux/*)
 
 HEADERS = \
 	$(sort \
diff --git a/src/libruntime/linux/jerry-assert.c b/src/libruntime/target/linux/jerry-assert.c
similarity index 100%
rename from src/libruntime/linux/jerry-assert.c
rename to src/libruntime/target/linux/jerry-assert.c
diff --git a/src/libruntime/stm32f4/jerry-assert.c b/src/libruntime/target/stm32f4/jerry-assert.c
similarity index 100%
rename from src/libruntime/stm32f4/jerry-assert.c
rename to src/libruntime/target/stm32f4/jerry-assert.c