diff --git a/Makefile b/Makefile
index 084c63b1..8bcb6e1e 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ timer:
 
 toolchain: defconfig
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
-	@cp -rf $(PWD)/general/legacy/package/gcc $(TARGET)/buildroot-$(BR_VER)/package
+	@cp -rf $(PWD)/general/package/gcc $(TARGET)/buildroot-$(BR_VER)/package
 	@$(MAKE) -f $(PWD)/general/toolchain.mk BR_CONF=$(BR_CONF) CONFIG=$(PWD)/$(CONFIG)
 	@$(BR_MAKE) BR2_DEFCONFIG=$(BR_CONF) defconfig
 endif
diff --git a/general/legacy/package/gcc/Config.in.host b/general/package/gcc/Config.in.host
similarity index 99%
rename from general/legacy/package/gcc/Config.in.host
rename to general/package/gcc/Config.in.host
index e8d112a8..ade0ee82 100644
--- a/general/legacy/package/gcc/Config.in.host
+++ b/general/package/gcc/Config.in.host
@@ -5,7 +5,7 @@ choice
 	default BR2_GCC_VERSION_ARC if BR2_GCC_VERSION_4_8_ARC # legacy
 	default BR2_GCC_VERSION_ARC if BR2_arc
 	default BR2_GCC_VERSION_POWERPC_SPE if BR2_POWERPC_CPU_HAS_SPE
-	default BR2_GCC_VERSION_12_X
+	default BR2_GCC_VERSION_13_X
 	help
 	  Select the version of gcc you wish to use.
 
diff --git a/general/legacy/scripts/general/boot.scr b/general/scripts/legacy/general/boot.scr
similarity index 100%
rename from general/legacy/scripts/general/boot.scr
rename to general/scripts/legacy/general/boot.scr
diff --git a/general/legacy/scripts/general/bump_gcc_everywhere.sh b/general/scripts/legacy/general/bump_gcc_everywhere.sh
similarity index 100%
rename from general/legacy/scripts/general/bump_gcc_everywhere.sh
rename to general/scripts/legacy/general/bump_gcc_everywhere.sh
diff --git a/general/legacy/scripts/general/compile4programmer.sh b/general/scripts/legacy/general/compile4programmer.sh
similarity index 100%
rename from general/legacy/scripts/general/compile4programmer.sh
rename to general/scripts/legacy/general/compile4programmer.sh
diff --git a/general/legacy/scripts/general/create_overlayed_rootfs.sh b/general/scripts/legacy/general/create_overlayed_rootfs.sh
similarity index 100%
rename from general/legacy/scripts/general/create_overlayed_rootfs.sh
rename to general/scripts/legacy/general/create_overlayed_rootfs.sh
diff --git a/general/legacy/scripts/general/create_toolchain_binding.sh b/general/scripts/legacy/general/create_toolchain_binding.sh
similarity index 100%
rename from general/legacy/scripts/general/create_toolchain_binding.sh
rename to general/scripts/legacy/general/create_toolchain_binding.sh
diff --git a/general/legacy/scripts/general/show_kernel_vers.sh b/general/scripts/legacy/general/show_kernel_vers.sh
similarity index 100%
rename from general/legacy/scripts/general/show_kernel_vers.sh
rename to general/scripts/legacy/general/show_kernel_vers.sh
diff --git a/general/legacy/scripts/init.d/S50telnet b/general/scripts/legacy/init.d/S50telnet
similarity index 100%
rename from general/legacy/scripts/init.d/S50telnet
rename to general/scripts/legacy/init.d/S50telnet
diff --git a/general/legacy/scripts/sbin/light b/general/scripts/legacy/sbin/light
similarity index 100%
rename from general/legacy/scripts/sbin/light
rename to general/scripts/legacy/sbin/light
diff --git a/general/legacy/scripts/sbin/profiler b/general/scripts/legacy/sbin/profiler
similarity index 100%
rename from general/legacy/scripts/sbin/profiler
rename to general/scripts/legacy/sbin/profiler
diff --git a/general/legacy/scripts/sbin/resetd b/general/scripts/legacy/sbin/resetd
similarity index 100%
rename from general/legacy/scripts/sbin/resetd
rename to general/scripts/legacy/sbin/resetd
diff --git a/general/toolchain.mk b/general/toolchain.mk
index 13ab49bc..8e93cdcd 100644
--- a/general/toolchain.mk
+++ b/general/toolchain.mk
@@ -39,4 +39,3 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3),y)
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_0),y)
 	@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y" >> $(BR_CONF)
 endif
-	@echo "BR2_GCC_VERSION_13_X=y" >> $(BR_CONF)