diff --git a/platform/beken-7231n/config/sys_config.h b/cores/beken-7231n/base/config/sys_config.h
similarity index 100%
rename from platform/beken-7231n/config/sys_config.h
rename to cores/beken-7231n/base/config/sys_config.h
diff --git a/platform/beken-7231n/fixups/temp_detect.c b/cores/beken-7231n/base/src/fixups/temp_detect.c
similarity index 100%
rename from platform/beken-7231n/fixups/temp_detect.c
rename to cores/beken-7231n/base/src/fixups/temp_detect.c
diff --git a/platform/beken-7231u/config/sys_config.h b/cores/beken-7231u/base/config/sys_config.h
similarity index 100%
rename from platform/beken-7231u/config/sys_config.h
rename to cores/beken-7231u/base/config/sys_config.h
diff --git a/platform/beken-72xx/fixups/boot_handlers_105_bk7231s.S b/cores/beken-7231u/src/fixups/boot_handlers_105_bk7231s.S
similarity index 100%
rename from platform/beken-72xx/fixups/boot_handlers_105_bk7231s.S
rename to cores/beken-7231u/src/fixups/boot_handlers_105_bk7231s.S
diff --git a/platform/beken-7251/config/sys_config.h b/cores/beken-7251/base/config/sys_config.h
similarity index 100%
rename from platform/beken-7251/config/sys_config.h
rename to cores/beken-7251/base/config/sys_config.h
diff --git a/platform/beken-72xx/config/lwipopts.h b/cores/beken-72xx/base/config/lwipopts.h
similarity index 100%
rename from platform/beken-72xx/config/lwipopts.h
rename to cores/beken-72xx/base/config/lwipopts.h
diff --git a/platform/beken-72xx/config/param_config.h b/cores/beken-72xx/base/inc/fixups/param_config.h
similarity index 100%
rename from platform/beken-72xx/config/param_config.h
rename to cores/beken-72xx/base/inc/fixups/param_config.h
diff --git a/platform/beken-72xx/fixups/inc/uart_pub.h b/cores/beken-72xx/base/inc/fixups/uart_pub.h
similarity index 100%
rename from platform/beken-72xx/fixups/inc/uart_pub.h
rename to cores/beken-72xx/base/inc/fixups/uart_pub.h
diff --git a/platform/beken-72xx/fixups/arch_main.c b/cores/beken-72xx/base/src/fixups/arch_main.c
similarity index 100%
rename from platform/beken-72xx/fixups/arch_main.c
rename to cores/beken-72xx/base/src/fixups/arch_main.c
diff --git a/platform/beken-72xx/fixups/ate_app.c b/cores/beken-72xx/base/src/fixups/ate_app.c
similarity index 100%
rename from platform/beken-72xx/fixups/ate_app.c
rename to cores/beken-72xx/base/src/fixups/ate_app.c
diff --git a/platform/beken-72xx/fixups/clock_cal.c b/cores/beken-72xx/base/src/fixups/clock_cal.c
similarity index 100%
rename from platform/beken-72xx/fixups/clock_cal.c
rename to cores/beken-72xx/base/src/fixups/clock_cal.c
diff --git a/platform/beken-72xx/fixups/clock_rtos.c b/cores/beken-72xx/base/src/fixups/clock_rtos.c
similarity index 100%
rename from platform/beken-72xx/fixups/clock_rtos.c
rename to cores/beken-72xx/base/src/fixups/clock_rtos.c
diff --git a/platform/beken-72xx/fixups/intc.c b/cores/beken-72xx/base/src/fixups/intc.c
similarity index 100%
rename from platform/beken-72xx/fixups/intc.c
rename to cores/beken-72xx/base/src/fixups/intc.c
diff --git a/platform/beken-72xx/fixups/wrap_BkDriverFlash.c b/cores/beken-72xx/base/src/wraps/BkDriverFlash.c
similarity index 100%
rename from platform/beken-72xx/fixups/wrap_BkDriverFlash.c
rename to cores/beken-72xx/base/src/wraps/BkDriverFlash.c
diff --git a/platform/beken-72xx/fixups/wrap_wlan_ui.c b/cores/beken-72xx/base/src/wraps/wlan_ui.c
similarity index 100%
rename from platform/beken-72xx/fixups/wrap_wlan_ui.c
rename to cores/beken-72xx/base/src/wraps/wlan_ui.c
diff --git a/platform/beken-72xx/ld/bk7231_bsp.ld b/cores/beken-72xx/misc/bk7231_bsp.ld
similarity index 100%
rename from platform/beken-72xx/ld/bk7231_bsp.ld
rename to cores/beken-72xx/misc/bk7231_bsp.ld
diff --git a/platform/beken-72xx/ld/bk7231n_bsp.ld b/cores/beken-72xx/misc/bk7231n_bsp.ld
similarity index 100%
rename from platform/beken-72xx/ld/bk7231n_bsp.ld
rename to cores/beken-72xx/misc/bk7231n_bsp.ld
diff --git a/platform/beken-72xx/openocd/bk72xx.cfg b/cores/beken-72xx/misc/bk72xx.cfg
similarity index 100%
rename from platform/beken-72xx/openocd/bk72xx.cfg
rename to cores/beken-72xx/misc/bk72xx.cfg
diff --git a/platform/common/config/lwipopts.h b/cores/common/base/config/lwipopts.h
similarity index 100%
rename from platform/common/config/lwipopts.h
rename to cores/common/base/config/lwipopts.h
diff --git a/platform/common/fixups/errno.h b/cores/common/base/inc/fixups/errno.h
similarity index 100%
rename from platform/common/fixups/errno.h
rename to cores/common/base/inc/fixups/errno.h
diff --git a/platform/common/fixups/lwip/errno.h b/cores/common/base/inc/fixups/lwip/errno.h
similarity index 100%
rename from platform/common/fixups/lwip/errno.h
rename to cores/common/base/inc/fixups/lwip/errno.h
diff --git a/platform/common/fixups/lib_inc/certs.h b/cores/common/base/inc/proxy/certs.h
similarity index 100%
rename from platform/common/fixups/lib_inc/certs.h
rename to cores/common/base/inc/proxy/certs.h
diff --git a/platform/common/fixups/lib_inc/err.h b/cores/common/base/inc/proxy/err.h
similarity index 100%
rename from platform/common/fixups/lib_inc/err.h
rename to cores/common/base/inc/proxy/err.h
diff --git a/platform/common/fixups/lib_inc/netdb.h b/cores/common/base/inc/proxy/netdb.h
similarity index 100%
rename from platform/common/fixups/lib_inc/netdb.h
rename to cores/common/base/inc/proxy/netdb.h
diff --git a/platform/common/fixups/lib_inc/netif.h b/cores/common/base/inc/proxy/netif.h
similarity index 100%
rename from platform/common/fixups/lib_inc/netif.h
rename to cores/common/base/inc/proxy/netif.h
diff --git a/platform/common/fixups/lib_inc/sockets.h b/cores/common/base/inc/proxy/sockets.h
similarity index 100%
rename from platform/common/fixups/lib_inc/sockets.h
rename to cores/common/base/inc/proxy/sockets.h
diff --git a/platform/common/fixups/lib_inc/sys.h b/cores/common/base/inc/proxy/sys.h
similarity index 100%
rename from platform/common/fixups/lib_inc/sys.h
rename to cores/common/base/inc/proxy/sys.h
diff --git a/platform/common/fixups/lib_inc/tcpip.h b/cores/common/base/inc/proxy/tcpip.h
similarity index 100%
rename from platform/common/fixups/lib_inc/tcpip.h
rename to cores/common/base/inc/proxy/tcpip.h
diff --git a/platform/common/fixups/lib_inc/udp.h b/cores/common/base/inc/proxy/udp.h
similarity index 100%
rename from platform/common/fixups/lib_inc/udp.h
rename to cores/common/base/inc/proxy/udp.h
diff --git a/platform/realtek-amb/config/build_info.h b/cores/realtek-amb/base/config/build_info.h
similarity index 100%
rename from platform/realtek-amb/config/build_info.h
rename to cores/realtek-amb/base/config/build_info.h
diff --git a/platform/realtek-amb/config/lwipopts.h b/cores/realtek-amb/base/config/lwipopts.h
similarity index 100%
rename from platform/realtek-amb/config/lwipopts.h
rename to cores/realtek-amb/base/config/lwipopts.h
diff --git a/platform/realtek-amb/config/main.h b/cores/realtek-amb/base/config/main.h
similarity index 100%
rename from platform/realtek-amb/config/main.h
rename to cores/realtek-amb/base/config/main.h
diff --git a/platform/realtek-ambz/config/FreeRTOSConfig.h b/cores/realtek-ambz/base/config/FreeRTOSConfig.h
similarity index 100%
rename from platform/realtek-ambz/config/FreeRTOSConfig.h
rename to cores/realtek-ambz/base/config/FreeRTOSConfig.h
diff --git a/platform/realtek-ambz/config/autoconf.h b/cores/realtek-ambz/base/config/autoconf.h
similarity index 100%
rename from platform/realtek-ambz/config/autoconf.h
rename to cores/realtek-ambz/base/config/autoconf.h
diff --git a/platform/realtek-ambz/config/lwipopts.h b/cores/realtek-ambz/base/config/lwipopts.h
similarity index 100%
rename from platform/realtek-ambz/config/lwipopts.h
rename to cores/realtek-ambz/base/config/lwipopts.h
diff --git a/platform/realtek-ambz/config/platform_autoconf.h b/cores/realtek-ambz/base/config/platform_autoconf.h
similarity index 100%
rename from platform/realtek-ambz/config/platform_autoconf.h
rename to cores/realtek-ambz/base/config/platform_autoconf.h
diff --git a/platform/realtek-ambz/config/platform_opts.h b/cores/realtek-ambz/base/config/platform_opts.h
similarity index 100%
rename from platform/realtek-ambz/config/platform_opts.h
rename to cores/realtek-ambz/base/config/platform_opts.h
diff --git a/platform/realtek-ambz/fixups/inc/strproc.h b/cores/realtek-ambz/base/inc/fixups/strproc.h
similarity index 100%
rename from platform/realtek-ambz/fixups/inc/strproc.h
rename to cores/realtek-ambz/base/inc/fixups/strproc.h
diff --git a/platform/realtek-ambz/fixups/lwip/lwip_timers.h b/cores/realtek-ambz/base/inc/proxy/lwip_timers.h
similarity index 100%
rename from platform/realtek-ambz/fixups/lwip/lwip_timers.h
rename to cores/realtek-ambz/base/inc/proxy/lwip_timers.h
diff --git a/platform/realtek-ambz/fixups/app_start_patch.c b/cores/realtek-ambz/base/src/fixups/app_start_patch.c
similarity index 100%
rename from platform/realtek-ambz/fixups/app_start_patch.c
rename to cores/realtek-ambz/base/src/fixups/app_start_patch.c
diff --git a/platform/realtek-ambz/fixups/cmsis_ipsr.c b/cores/realtek-ambz/base/src/fixups/cmsis_ipsr.c
similarity index 100%
rename from platform/realtek-ambz/fixups/cmsis_ipsr.c
rename to cores/realtek-ambz/base/src/fixups/cmsis_ipsr.c
diff --git a/platform/realtek-ambz/fixups/lib_rtlstd_patch.a b/cores/realtek-ambz/base/src/fixups/lib_rtlstd_patch.a
similarity index 100%
rename from platform/realtek-ambz/fixups/lib_rtlstd_patch.a
rename to cores/realtek-ambz/base/src/fixups/lib_rtlstd_patch.a
diff --git a/platform/realtek-ambz/fixups/lib_rtlstd_patch.md b/cores/realtek-ambz/base/src/fixups/lib_rtlstd_patch.md
similarity index 100%
rename from platform/realtek-ambz/fixups/lib_rtlstd_patch.md
rename to cores/realtek-ambz/base/src/fixups/lib_rtlstd_patch.md
diff --git a/platform/realtek-ambz/fixups/log_uart.c b/cores/realtek-ambz/base/src/fixups/log_uart.c
similarity index 100%
rename from platform/realtek-ambz/fixups/log_uart.c
rename to cores/realtek-ambz/base/src/fixups/log_uart.c
diff --git a/platform/realtek-ambz/fixups/net_sockets.c b/cores/realtek-ambz/base/src/fixups/net_sockets.c
similarity index 100%
rename from platform/realtek-ambz/fixups/net_sockets.c
rename to cores/realtek-ambz/base/src/fixups/net_sockets.c
diff --git a/platform/realtek-ambz/fixups/ssl_tls.c b/cores/realtek-ambz/base/src/fixups/ssl_tls.c
similarity index 100%
rename from platform/realtek-ambz/fixups/ssl_tls.c
rename to cores/realtek-ambz/base/src/fixups/ssl_tls.c
diff --git a/platform/realtek-ambz/fixups/wifi_mode.c b/cores/realtek-ambz/base/src/fixups/wifi_mode.c
similarity index 100%
rename from platform/realtek-ambz/fixups/wifi_mode.c
rename to cores/realtek-ambz/base/src/fixups/wifi_mode.c
diff --git a/platform/realtek-ambz/openocd/amebaz.cfg b/cores/realtek-ambz/misc/amebaz.cfg
similarity index 100%
rename from platform/realtek-ambz/openocd/amebaz.cfg
rename to cores/realtek-ambz/misc/amebaz.cfg
diff --git a/platform/realtek-ambz/bin/boot_all_10C7.bin b/cores/realtek-ambz/misc/boot_all_10C7.bin
similarity index 100%
rename from platform/realtek-ambz/bin/boot_all_10C7.bin
rename to cores/realtek-ambz/misc/boot_all_10C7.bin
diff --git a/platform/realtek-ambz/bin/boot_all_77F7.bin b/cores/realtek-ambz/misc/boot_all_77F7.bin
similarity index 100%
rename from platform/realtek-ambz/bin/boot_all_77F7.bin
rename to cores/realtek-ambz/misc/boot_all_77F7.bin
diff --git a/platform/realtek-ambz/bin/boot_all_C556.bin b/cores/realtek-ambz/misc/boot_all_C556.bin
similarity index 100%
rename from platform/realtek-ambz/bin/boot_all_C556.bin
rename to cores/realtek-ambz/misc/boot_all_C556.bin
diff --git a/platform/realtek-ambz/ld/export-rom_symbol_v01.txt b/cores/realtek-ambz/misc/export-rom_symbol_v01.txt
similarity index 100%
rename from platform/realtek-ambz/ld/export-rom_symbol_v01.txt
rename to cores/realtek-ambz/misc/export-rom_symbol_v01.txt
diff --git a/platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip1_2M_468k_cpp.ld b/cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip1_2M_468k_cpp.ld
similarity index 100%
rename from platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip1_2M_468k_cpp.ld
rename to cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip1_2M_468k_cpp.ld
diff --git a/platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip1_2M_cpp.ld b/cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip1_2M_cpp.ld
similarity index 100%
rename from platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip1_2M_cpp.ld
rename to cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip1_2M_cpp.ld
diff --git a/platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip1_4M_980k_cpp.ld b/cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip1_4M_980k_cpp.ld
similarity index 100%
rename from platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip1_4M_980k_cpp.ld
rename to cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip1_4M_980k_cpp.ld
diff --git a/platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip2_2M_468k_cpp.ld b/cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip2_2M_468k_cpp.ld
similarity index 100%
rename from platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip2_2M_468k_cpp.ld
rename to cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip2_2M_468k_cpp.ld
diff --git a/platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip2_2M_cpp.ld b/cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip2_2M_cpp.ld
similarity index 100%
rename from platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip2_2M_cpp.ld
rename to cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip2_2M_cpp.ld
diff --git a/platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip2_4M_980k_cpp.ld b/cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip2_4M_980k_cpp.ld
similarity index 100%
rename from platform/realtek-ambz/ld/rlx8711B-symbol-v02-img2_xip2_4M_980k_cpp.ld
rename to cores/realtek-ambz/misc/rlx8711B-symbol-v02-img2_xip2_4M_980k_cpp.ld
diff --git a/platform/realtek-ambz2/config/FreeRTOSConfig.h b/cores/realtek-ambz2/base/config/FreeRTOSConfig.h
similarity index 100%
rename from platform/realtek-ambz2/config/FreeRTOSConfig.h
rename to cores/realtek-ambz2/base/config/FreeRTOSConfig.h
diff --git a/platform/realtek-ambz2/config/autoconf.h b/cores/realtek-ambz2/base/config/autoconf.h
similarity index 100%
rename from platform/realtek-ambz2/config/autoconf.h
rename to cores/realtek-ambz2/base/config/autoconf.h
diff --git a/platform/realtek-ambz2/config/lwipopts.h b/cores/realtek-ambz2/base/config/lwipopts.h
similarity index 100%
rename from platform/realtek-ambz2/config/lwipopts.h
rename to cores/realtek-ambz2/base/config/lwipopts.h
diff --git a/platform/realtek-ambz2/config/platform_opts.h b/cores/realtek-ambz2/base/config/platform_opts.h
similarity index 100%
rename from platform/realtek-ambz2/config/platform_opts.h
rename to cores/realtek-ambz2/base/config/platform_opts.h
diff --git a/platform/realtek-ambz2/config/platform_opts_bt.h b/cores/realtek-ambz2/base/config/platform_opts_bt.h
similarity index 100%
rename from platform/realtek-ambz2/config/platform_opts_bt.h
rename to cores/realtek-ambz2/base/config/platform_opts_bt.h
diff --git a/platform/realtek-ambz2/fixups/inc/time64.h b/cores/realtek-ambz2/base/inc/fixups/time64.h
similarity index 100%
rename from platform/realtek-ambz2/fixups/inc/time64.h
rename to cores/realtek-ambz2/base/inc/fixups/time64.h
diff --git a/platform/realtek-ambz2/ld/rtl8710c_ram.ld b/cores/realtek-ambz2/misc/rtl8710c_ram.ld
similarity index 100%
rename from platform/realtek-ambz2/ld/rtl8710c_ram.ld
rename to cores/realtek-ambz2/misc/rtl8710c_ram.ld
diff --git a/platform/.clang-format b/platform/.clang-format
deleted file mode 100644
index 47a38a9..0000000
--- a/platform/.clang-format
+++ /dev/null
@@ -1,2 +0,0 @@
-DisableFormat: true
-SortIncludes: Never
diff --git a/platform/common/fixups/WCharacterFixup.h b/platform/common/fixups/WCharacterFixup.h
deleted file mode 100644
index e1333d4..0000000
--- a/platform/common/fixups/WCharacterFixup.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (c) Kuba Szczodrzyński 2022-04-23. */
-
-/* WCharacter.h uses deprecated isascii() and toascii(),
-   which are available in gnu++11 but not c++11 */
-#include <cstddef>
-
-#ifdef __STRICT_ANSI__
-
-inline bool isascii(int c) {
-  return ((c & ~0x7f) != 0 ? false : true);
-}
-
-inline bool toascii(int c) {
-  return (c & 0x7f);
-}
-
-#endif
diff --git a/platform/realtek-ambz/bin/descript.ion b/platform/realtek-ambz/bin/descript.ion
deleted file mode 100644
index 4074cb3..0000000
--- a/platform/realtek-ambz/bin/descript.ion
+++ /dev/null
@@ -1 +0,0 @@
-boot_all_77F7.bin tysdk_for_rtl8710bn