diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/analogin_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/analogin_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/analogin_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/analogin_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/analogin_ext.h b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/analogin_ext.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/analogin_ext.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/analogin_ext.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/analogout_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/analogout_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/analogout_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/analogout_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/sdk/platform_opts.h b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/platform_opts.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/sdk/platform_opts.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/platform_opts.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/cmsis/device/strproc.h b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/strproc.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/cmsis/device/strproc.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/strproc.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/flash_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/flash_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/flash_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/flash_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/flash_ext.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/flash_ext.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/flash_ext.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/flash_ext.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/flash_ext.h b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/flash_ext.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/flash_ext.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/flash_ext.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/gpio_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/gpio_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/gpio_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/gpio_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/gpio_irq_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/gpio_irq_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/gpio_irq_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/gpio_irq_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/i2c_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/i2c_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/i2c_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/i2c_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/log_uart_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/log_uart_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/log_uart_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/log_uart_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/log_uart_api.h b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/log_uart_api.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/log_uart_api.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/log_uart_api.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/ota_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/ota_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/ota_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/ota_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/ota_api.h b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/ota_api.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/ota_api.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/ota_api.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/port_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/port_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/port_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/port_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/pwmout_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/pwmout_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/pwmout_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/pwmout_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/rtc_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/rtc_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/rtc_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/rtc_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/serial_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/serial_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/serial_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/serial_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/spi_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/spi_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/spi_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/spi_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/timer_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/timer_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/timer_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/timer_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/timer_api.h b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/timer_api.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/timer_api.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/timer_api.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/trng_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/trng_api.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/trng_api.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/trng_api.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/us_ticker.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/us_ticker.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/us_ticker.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/us_ticker.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/rtx2/rtx2_service.c b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/cmsis_rtos/cmsis_rtos_service.c
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/rtx2/rtx2_service.c
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/cmsis_rtos/cmsis_rtos_service.c
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/rtx2/rtx2_service.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/cmsis_rtos/cmsis_rtos_service.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/rtx2/rtx2_service.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/cmsis_rtos/cmsis_rtos_service.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/os_dep/include/osdep_service.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/os_dep/include/osdep_service.h
index 68cba7a6ef..1eaf214e85 100644
--- a/targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/os_dep/include/osdep_service.h
+++ b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/os/os_dep/include/osdep_service.h
@@ -104,7 +104,7 @@ extern "C" {
 #elif defined( PLATFORM_ECOS)
 #include "ecos/ecos_service.h"
 #elif defined(PLATFORM_CMSIS_RTOS)
-#include "rtx2_service.h"
+#include "cmsis_rtos_service.h"
 #endif
 
 #define RTW_MAX_DELAY			0xFFFFFFFF
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/hal_pinmux.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/hal_pinmux.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/hal_pinmux.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/hal_pinmux.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/hal_platform.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/hal_platform.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/hal_platform.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/hal_platform.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_adc.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_adc.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_adc.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_adc.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_dac.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_dac.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_dac.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_dac.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_gdma.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gdma.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_gdma.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gdma.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_gpio.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gpio.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_gpio.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gpio.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_i2c.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_i2c.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_i2c.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_i2c.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_peri_on.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_peri_on.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_peri_on.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_peri_on.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_pwm.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_pwm.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_pwm.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_pwm.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_sdio.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sdio.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_sdio.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sdio.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_spi_flash.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_spi_flash.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_spi_flash.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_spi_flash.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_ssi.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_ssi.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_ssi.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_ssi.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_sys_on.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sys_on.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_sys_on.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sys_on.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_timer.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_timer.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_timer.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_timer.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_uart.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_uart.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_uart.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_uart.h
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_wdt.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_wdt.h
similarity index 100%
rename from targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_wdt.h
rename to targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_wdt.h