diff --git a/board/GD32VF103C_START/eclipse/hello_world/.settings/ilg.gnumcueclipse.debug.gdbjtag.openocd.prefs b/board/GD32VF103C_START/eclipse/hello_world/.settings/ilg.gnumcueclipse.debug.gdbjtag.openocd.prefs
deleted file mode 100644
index a469e11b..00000000
--- a/board/GD32VF103C_START/eclipse/hello_world/.settings/ilg.gnumcueclipse.debug.gdbjtag.openocd.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-executable.name=openocd
-install.folder=/Users/ace/sys/gnu-mcu-eclipse/openocd/self/bin
diff --git a/board/GD32VF103C_START/eclipse/hello_world/.settings/ilg.gnumcueclipse.managedbuild.cross.riscv.prefs b/board/GD32VF103C_START/eclipse/hello_world/.settings/ilg.gnumcueclipse.managedbuild.cross.riscv.prefs
deleted file mode 100644
index 8cebf325..00000000
--- a/board/GD32VF103C_START/eclipse/hello_world/.settings/ilg.gnumcueclipse.managedbuild.cross.riscv.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-toolchain.path.512258282=/Users/ace/sys/gnu-mcu-eclipse/riscv-none-gcc/8.2.0-2.2-20190521-0004/bin
diff --git a/board/GD32VF103C_START/eclipse/hello_world/.settings/language.settings.xml b/board/GD32VF103C_START/eclipse/hello_world/.settings/language.settings.xml
deleted file mode 100644
index cf17e40e..00000000
--- a/board/GD32VF103C_START/eclipse/hello_world/.settings/language.settings.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/board/GigaDevice_GD32VF103C_START/.project b/board/GigaDevice_GD32VF103C_START/.project
new file mode 100644
index 00000000..87584654
--- /dev/null
+++ b/board/GigaDevice_GD32VF103C_START/.project
@@ -0,0 +1,11 @@
+
+
+ GigaDevice_GD32VF103C_START
+
+
+
+
+
+
+
+
diff --git a/board/GD32VF103C_START/BSP/Inc/mcu_init.h b/board/GigaDevice_GD32VF103C_START/BSP/Inc/mcu_init.h
similarity index 100%
rename from board/GD32VF103C_START/BSP/Inc/mcu_init.h
rename to board/GigaDevice_GD32VF103C_START/BSP/Inc/mcu_init.h
diff --git a/board/GD32VF103C_START/BSP/Inc/usart.h b/board/GigaDevice_GD32VF103C_START/BSP/Inc/usart.h
similarity index 100%
rename from board/GD32VF103C_START/BSP/Inc/usart.h
rename to board/GigaDevice_GD32VF103C_START/BSP/Inc/usart.h
diff --git a/board/GD32VF103C_START/BSP/Src/mcu_init.c b/board/GigaDevice_GD32VF103C_START/BSP/Src/mcu_init.c
similarity index 100%
rename from board/GD32VF103C_START/BSP/Src/mcu_init.c
rename to board/GigaDevice_GD32VF103C_START/BSP/Src/mcu_init.c
diff --git a/board/GD32VF103C_START/BSP/Src/usart.c b/board/GigaDevice_GD32VF103C_START/BSP/Src/usart.c
similarity index 100%
rename from board/GD32VF103C_START/BSP/Src/usart.c
rename to board/GigaDevice_GD32VF103C_START/BSP/Src/usart.c
diff --git a/board/GD32VF103C_START/TOS_CONFIG/tos_config.h b/board/GigaDevice_GD32VF103C_START/TOS_CONFIG/tos_config.h
similarity index 100%
rename from board/GD32VF103C_START/TOS_CONFIG/tos_config.h
rename to board/GigaDevice_GD32VF103C_START/TOS_CONFIG/tos_config.h
diff --git a/board/GD32VF103C_START/eclipse/hello_world/.cproject b/board/GigaDevice_GD32VF103C_START/eclipse/hello_world/.cproject
similarity index 99%
rename from board/GD32VF103C_START/eclipse/hello_world/.cproject
rename to board/GigaDevice_GD32VF103C_START/eclipse/hello_world/.cproject
index da3ae3b1..3857fccb 100644
--- a/board/GD32VF103C_START/eclipse/hello_world/.cproject
+++ b/board/GigaDevice_GD32VF103C_START/eclipse/hello_world/.cproject
@@ -153,9 +153,9 @@
diff --git a/board/GD32VF103C_START/eclipse/hello_world/.gitignore b/board/GigaDevice_GD32VF103C_START/eclipse/hello_world/.gitignore
similarity index 100%
rename from board/GD32VF103C_START/eclipse/hello_world/.gitignore
rename to board/GigaDevice_GD32VF103C_START/eclipse/hello_world/.gitignore
diff --git a/board/GD32VF103C_START/eclipse/hello_world/.project b/board/GigaDevice_GD32VF103C_START/eclipse/hello_world/.project
similarity index 91%
rename from board/GD32VF103C_START/eclipse/hello_world/.project
rename to board/GigaDevice_GD32VF103C_START/eclipse/hello_world/.project
index bda85e3d..054900e6 100644
--- a/board/GD32VF103C_START/eclipse/hello_world/.project
+++ b/board/GigaDevice_GD32VF103C_START/eclipse/hello_world/.project
@@ -42,12 +42,12 @@
Application/Inc
2
- TOP_DIR/board/GD32VF103C_START/BSP/Inc
+ $%7BPARENT-2-PROJECT_LOC%7D/BSP/Inc
Application/Src
2
- TOP_DIR/board/GD32VF103C_START/BSP/Src
+ $%7BPARENT-2-PROJECT_LOC%7D/BSP/Src
Application/tos_config.h
diff --git a/board/GD32VF103C_START/eclipse/hello_world/gd32vf103_libopt.h b/board/GigaDevice_GD32VF103C_START/eclipse/hello_world/gd32vf103_libopt.h
similarity index 100%
rename from board/GD32VF103C_START/eclipse/hello_world/gd32vf103_libopt.h
rename to board/GigaDevice_GD32VF103C_START/eclipse/hello_world/gd32vf103_libopt.h
diff --git a/board/GD32VF103C_START/eclipse/hello_world/link.lds b/board/GigaDevice_GD32VF103C_START/eclipse/hello_world/link.lds
similarity index 100%
rename from board/GD32VF103C_START/eclipse/hello_world/link.lds
rename to board/GigaDevice_GD32VF103C_START/eclipse/hello_world/link.lds
diff --git a/board/GD32VF103C_START/eclipse/hello_world/main.c b/board/GigaDevice_GD32VF103C_START/eclipse/hello_world/main.c
similarity index 100%
rename from board/GD32VF103C_START/eclipse/hello_world/main.c
rename to board/GigaDevice_GD32VF103C_START/eclipse/hello_world/main.c
diff --git a/board/GD32VF103C_START/eclipse/hello_world/openocd_gdlink.cfg b/board/GigaDevice_GD32VF103C_START/eclipse/hello_world/openocd_gdlink.cfg
similarity index 100%
rename from board/GD32VF103C_START/eclipse/hello_world/openocd_gdlink.cfg
rename to board/GigaDevice_GD32VF103C_START/eclipse/hello_world/openocd_gdlink.cfg
diff --git a/board/SipeedLonganNano/BSP/Inc/mcu_init.h b/board/Sipeed_LonganNano/BSP/Inc/mcu_init.h
similarity index 100%
rename from board/SipeedLonganNano/BSP/Inc/mcu_init.h
rename to board/Sipeed_LonganNano/BSP/Inc/mcu_init.h
diff --git a/board/SipeedLonganNano/BSP/Inc/usart.h b/board/Sipeed_LonganNano/BSP/Inc/usart.h
similarity index 100%
rename from board/SipeedLonganNano/BSP/Inc/usart.h
rename to board/Sipeed_LonganNano/BSP/Inc/usart.h
diff --git a/board/SipeedLonganNano/BSP/Src/mcu_init.c b/board/Sipeed_LonganNano/BSP/Src/mcu_init.c
similarity index 100%
rename from board/SipeedLonganNano/BSP/Src/mcu_init.c
rename to board/Sipeed_LonganNano/BSP/Src/mcu_init.c
diff --git a/board/SipeedLonganNano/BSP/Src/usart.c b/board/Sipeed_LonganNano/BSP/Src/usart.c
similarity index 100%
rename from board/SipeedLonganNano/BSP/Src/usart.c
rename to board/Sipeed_LonganNano/BSP/Src/usart.c
diff --git a/board/SipeedLonganNano/README.md b/board/Sipeed_LonganNano/README.md
similarity index 100%
rename from board/SipeedLonganNano/README.md
rename to board/Sipeed_LonganNano/README.md
diff --git a/board/SipeedLonganNano/TOS_CONFIG/tos_config.h b/board/Sipeed_LonganNano/TOS_CONFIG/tos_config.h
similarity index 100%
rename from board/SipeedLonganNano/TOS_CONFIG/tos_config.h
rename to board/Sipeed_LonganNano/TOS_CONFIG/tos_config.h
diff --git a/board/SipeedLonganNano/eclipse/hello_world/.cproject b/board/Sipeed_LonganNano/eclipse/hello_world/.cproject
similarity index 100%
rename from board/SipeedLonganNano/eclipse/hello_world/.cproject
rename to board/Sipeed_LonganNano/eclipse/hello_world/.cproject
diff --git a/board/SipeedLonganNano/eclipse/hello_world/.gitignore b/board/Sipeed_LonganNano/eclipse/hello_world/.gitignore
similarity index 100%
rename from board/SipeedLonganNano/eclipse/hello_world/.gitignore
rename to board/Sipeed_LonganNano/eclipse/hello_world/.gitignore
diff --git a/board/SipeedLonganNano/eclipse/hello_world/.project b/board/Sipeed_LonganNano/eclipse/hello_world/.project
similarity index 91%
rename from board/SipeedLonganNano/eclipse/hello_world/.project
rename to board/Sipeed_LonganNano/eclipse/hello_world/.project
index c5eb0fb6..054900e6 100644
--- a/board/SipeedLonganNano/eclipse/hello_world/.project
+++ b/board/Sipeed_LonganNano/eclipse/hello_world/.project
@@ -42,12 +42,12 @@
Application/Inc
2
- TOP_DIR/board/SipeedLonganNano/BSP/Inc
+ $%7BPARENT-2-PROJECT_LOC%7D/BSP/Inc
Application/Src
2
- TOP_DIR/board/SipeedLonganNano/BSP/Src
+ $%7BPARENT-2-PROJECT_LOC%7D/BSP/Src
Application/tos_config.h
diff --git a/board/SipeedLonganNano/eclipse/hello_world/gd32vf103_libopt.h b/board/Sipeed_LonganNano/eclipse/hello_world/gd32vf103_libopt.h
similarity index 100%
rename from board/SipeedLonganNano/eclipse/hello_world/gd32vf103_libopt.h
rename to board/Sipeed_LonganNano/eclipse/hello_world/gd32vf103_libopt.h
diff --git a/board/SipeedLonganNano/eclipse/hello_world/link.lds b/board/Sipeed_LonganNano/eclipse/hello_world/link.lds
similarity index 100%
rename from board/SipeedLonganNano/eclipse/hello_world/link.lds
rename to board/Sipeed_LonganNano/eclipse/hello_world/link.lds
diff --git a/board/SipeedLonganNano/eclipse/hello_world/main.c b/board/Sipeed_LonganNano/eclipse/hello_world/main.c
similarity index 100%
rename from board/SipeedLonganNano/eclipse/hello_world/main.c
rename to board/Sipeed_LonganNano/eclipse/hello_world/main.c
diff --git a/board/SipeedLonganNano/openocd_sipeed_rv_debugger.cfg b/board/Sipeed_LonganNano/openocd_sipeed_rv_debugger.cfg
similarity index 100%
rename from board/SipeedLonganNano/openocd_sipeed_rv_debugger.cfg
rename to board/Sipeed_LonganNano/openocd_sipeed_rv_debugger.cfg