diff --git a/jerry-libc/CMakeLists.txt b/jerry-libc/CMakeLists.txt
index f384d926f..9dc2e6617 100644
--- a/jerry-libc/CMakeLists.txt
+++ b/jerry-libc/CMakeLists.txt
@@ -50,15 +50,6 @@ set(COMPILE_FLAGS_LIBC "${COMPILE_FLAGS_JERRY} ${C_FLAGS_JERRY}")
  set(INCLUDE_LIBC_INTERFACE ${CMAKE_SOURCE_DIR}/jerry-libc/include)
  set(INCLUDE_LIBC_INTERFACE ${INCLUDE_LIBC_INTERFACE} PARENT_SCOPE)
 
- # Platform-specific
-  # Linux
-   set(INCLUDE_LIBC_LINUX target/linux)
-  # MCU
-   # STM32F3
-    set(INCLUDE_LIBC_MCU_STM32F3 target/mcu-stubs)
-   # STM32F4
-    set(INCLUDE_LIBC_MCU_STM32F4 target/mcu-stubs)
-
  # Third-party
   # Platform-specific
    # Linux
diff --git a/jerry-libc/target/linux/asm_arm.h b/jerry-libc/arch/arm-v7.h
similarity index 100%
rename from jerry-libc/target/linux/asm_arm.h
rename to jerry-libc/arch/arm-v7.h
diff --git a/jerry-libc/target/linux/asm_x86.h b/jerry-libc/arch/x86-32.h
similarity index 100%
rename from jerry-libc/target/linux/asm_x86.h
rename to jerry-libc/arch/x86-32.h
diff --git a/jerry-libc/target/linux/asm_x64.h b/jerry-libc/arch/x86-64.h
similarity index 100%
rename from jerry-libc/target/linux/asm_x64.h
rename to jerry-libc/arch/x86-64.h
diff --git a/jerry-libc/target/linux/jerry-asm.S b/jerry-libc/target/linux/jerry-asm.S
index 69fc3c74b..9c3eea19b 100644
--- a/jerry-libc/target/linux/jerry-asm.S
+++ b/jerry-libc/target/linux/jerry-asm.S
@@ -1,9 +1,9 @@
 #ifdef __TARGET_HOST_x64
-# include "asm_x64.h"
+# include "arch/x86-64.h"
 #elif defined (__TARGET_HOST_x86)
-# include "asm_x86.h"
+# include "arch/x86-32.h"
 #elif defined (__TARGET_HOST_ARMv7)
-# include "asm_arm.h"
+# include "arch/arm-v7.h"
 #else /* !__TARGET_HOST_x64 && !__TARGET_HOST_x86 && !__TARGET_HOST_ARMv7 */
 # error "!__TARGET_HOST_x64 && !__TARGET_HOST_x86 && !__TARGET_HOST_ARMv7"
 #endif /* !__TARGET_HOST_x64 && !__TARGET_HOST_x86 && !__TARGET_HOST_ARMv7 */
diff --git a/jerry-libc/target/linux/jerry-libc-target.c b/jerry-libc/target/linux/jerry-libc-target.c
index 4013ecde7..251a029ab 100644
--- a/jerry-libc/target/linux/jerry-libc-target.c
+++ b/jerry-libc/target/linux/jerry-libc-target.c
@@ -29,15 +29,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef __TARGET_HOST_x64
-# include "asm_x64.h"
-#elif defined (__TARGET_HOST_x86)
-# include "asm_x86.h"
-#elif defined (__TARGET_HOST_ARMv7)
-# include "asm_arm.h"
-#else /* !__TARGET_HOST_x64 && !__TARGET_HOST_x86 && !__TARGET_HOST_ARMv7 */
-# error "!__TARGET_HOST_x64 && !__TARGET_HOST_x86 && !__TARGET_HOST_ARMv7 "
-#endif /* !__TARGET_HOST_x64 && !__TARGET_HOST_x86 && !__TARGET_HOST_ARMv7 */
 #include "jerry-libc-defs.h"
 
 LIBC_UNREACHABLE_STUB_FOR (int raise (int sig_no __attr_unused___))