diff --git a/Software/simple_sbc/board/f1c200s_simple_sbc/boot.cmd b/Software/simple_sbc/board/simple_sbc/boot.cmd
similarity index 100%
rename from Software/simple_sbc/board/f1c200s_simple_sbc/boot.cmd
rename to Software/simple_sbc/board/simple_sbc/boot.cmd
diff --git a/Software/simple_sbc/board/f1c200s_simple_sbc/f1c200s_simple_sbc-linux_defconfig b/Software/simple_sbc/board/simple_sbc/f1c200s_simple_sbc-linux_defconfig
similarity index 100%
rename from Software/simple_sbc/board/f1c200s_simple_sbc/f1c200s_simple_sbc-linux_defconfig
rename to Software/simple_sbc/board/simple_sbc/f1c200s_simple_sbc-linux_defconfig
diff --git a/Software/simple_sbc/board/f1c200s_simple_sbc/f1c200s_simple_sbc-u-boot.dtsi b/Software/simple_sbc/board/simple_sbc/f1c200s_simple_sbc-u-boot.dtsi
similarity index 100%
rename from Software/simple_sbc/board/f1c200s_simple_sbc/f1c200s_simple_sbc-u-boot.dtsi
rename to Software/simple_sbc/board/simple_sbc/f1c200s_simple_sbc-u-boot.dtsi
diff --git a/Software/simple_sbc/board/f1c200s_simple_sbc/f1c200s_simple_sbc-uboot_defconfig b/Software/simple_sbc/board/simple_sbc/f1c200s_simple_sbc-uboot_defconfig
similarity index 100%
rename from Software/simple_sbc/board/f1c200s_simple_sbc/f1c200s_simple_sbc-uboot_defconfig
rename to Software/simple_sbc/board/simple_sbc/f1c200s_simple_sbc-uboot_defconfig
diff --git a/Software/simple_sbc/board/f1c200s_simple_sbc/f1c200s_simple_sbc.dts b/Software/simple_sbc/board/simple_sbc/f1c200s_simple_sbc.dts
similarity index 100%
rename from Software/simple_sbc/board/f1c200s_simple_sbc/f1c200s_simple_sbc.dts
rename to Software/simple_sbc/board/simple_sbc/f1c200s_simple_sbc.dts
diff --git a/Software/simple_sbc/board/f1c200s_simple_sbc/f1c200s_simple_sbc.dtsi b/Software/simple_sbc/board/simple_sbc/f1c200s_simple_sbc.dtsi
similarity index 100%
rename from Software/simple_sbc/board/f1c200s_simple_sbc/f1c200s_simple_sbc.dtsi
rename to Software/simple_sbc/board/simple_sbc/f1c200s_simple_sbc.dtsi
diff --git a/Software/simple_sbc/board/f1c200s_simple_sbc/genimage.cfg b/Software/simple_sbc/board/simple_sbc/genimage.cfg
similarity index 100%
rename from Software/simple_sbc/board/f1c200s_simple_sbc/genimage.cfg
rename to Software/simple_sbc/board/simple_sbc/genimage.cfg
diff --git a/Software/simple_sbc/board/f1c200s_simple_sbc/overlay/root/prime.lua b/Software/simple_sbc/board/simple_sbc/overlay/root/prime.lua
similarity index 100%
rename from Software/simple_sbc/board/f1c200s_simple_sbc/overlay/root/prime.lua
rename to Software/simple_sbc/board/simple_sbc/overlay/root/prime.lua
diff --git a/Software/simple_sbc/board/f1c200s_simple_sbc/patches/patches.md b/Software/simple_sbc/board/simple_sbc/patches/patches.md
similarity index 100%
rename from Software/simple_sbc/board/f1c200s_simple_sbc/patches/patches.md
rename to Software/simple_sbc/board/simple_sbc/patches/patches.md
diff --git a/Software/simple_sbc/board/f1c200s_simple_sbc/post-image.sh b/Software/simple_sbc/board/simple_sbc/post-image.sh
similarity index 100%
rename from Software/simple_sbc/board/f1c200s_simple_sbc/post-image.sh
rename to Software/simple_sbc/board/simple_sbc/post-image.sh
diff --git a/Software/simple_sbc/configs/f1c200s_simple_sbc_defconfig b/Software/simple_sbc/configs/f1c200s_simple_sbc_defconfig
index 462de86..317ceb1 100644
--- a/Software/simple_sbc/configs/f1c200s_simple_sbc_defconfig
+++ b/Software/simple_sbc/configs/f1c200s_simple_sbc_defconfig
@@ -4,18 +4,18 @@ BR2_PACKAGE_GLIBC_UTILS=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_ENABLE_DEBUG=y
 BR2_SHARED_STATIC_LIBS=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/f1c200s_simple_sbc/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/patches"
 BR2_TARGET_GENERIC_HOSTNAME="f1c200s-SimpleSBC"
 BR2_TARGET_GENERIC_ISSUE="Simple SBC Design for Future Projects"
 BR2_TARGET_GENERIC_GETTY_PORT="/dev/ttyS0"
 BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/f1c200s_simple_sbc/overlay"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/f1c200s_simple_sbc/post-image.sh"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/overlay"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/f1c200s_simple_sbc/f1c200s_simple_sbc-linux_defconfig"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/f1c200s_simple_sbc-linux_defconfig"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/f1c200s_simple_sbc/f1c200s_simple_sbc.dts $(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/f1c200s_simple_sbc/f1c200s_simple_sbc.dtsi"
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/f1c200s_simple_sbc.dts $(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/f1c200s_simple_sbc.dtsi"
 BR2_PACKAGE_LINUX_TOOLS_GPIO=y
 BR2_PACKAGE_COREMARK=y
 BR2_PACKAGE_DHRYSTONE=y
@@ -46,13 +46,13 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
 BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/f1c200s_simple_sbc/f1c200s_simple_sbc-uboot_defconfig"
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/f1c200s_simple_sbc-uboot_defconfig"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_FORMAT_DTB=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
-BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/f1c200s_simple_sbc/f1c200s_simple_sbc.dts $(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/f1c200s_simple_sbc.dtsi $(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/f1c200s_simple_sbc-u-boot.dtsi"
+BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/f1c200s_simple_sbc.dts $(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/f1c200s_simple_sbc.dtsi $(BR2_EXTERNAL_F1C200S_SIMPLE_SBC_PATH)/board/simple_sbc/f1c200s_simple_sbc-u-boot.dtsi"
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=f1c200s_simple_sbc"
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GENIMAGE=y