diff --git a/packages/gcc/8.4.0/8.3.0/0000-libtool-leave-framework-alone.patch b/packages/gcc/8.4.0/0000-libtool-leave-framework-alone.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0000-libtool-leave-framework-alone.patch
rename to packages/gcc/8.4.0/0000-libtool-leave-framework-alone.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0001-uclibc-conf.patch b/packages/gcc/8.4.0/0001-uclibc-conf.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0001-uclibc-conf.patch
rename to packages/gcc/8.4.0/0001-uclibc-conf.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/8.4.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
rename to packages/gcc/8.4.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/8.4.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch
rename to packages/gcc/8.4.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0004-arm-softfloat-libgcc.patch b/packages/gcc/8.4.0/0004-arm-softfloat-libgcc.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0004-arm-softfloat-libgcc.patch
rename to packages/gcc/8.4.0/0004-arm-softfloat-libgcc.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0005-fix-m68k-uclinux.patch b/packages/gcc/8.4.0/0005-fix-m68k-uclinux.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0005-fix-m68k-uclinux.patch
rename to packages/gcc/8.4.0/0005-fix-m68k-uclinux.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0006-libgfortran-missing-include.patch b/packages/gcc/8.4.0/0006-libgfortran-missing-include.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0006-libgfortran-missing-include.patch
rename to packages/gcc/8.4.0/0006-libgfortran-missing-include.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0007-nios2-bad-multilib-default.patch b/packages/gcc/8.4.0/0007-nios2-bad-multilib-default.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0007-nios2-bad-multilib-default.patch
rename to packages/gcc/8.4.0/0007-nios2-bad-multilib-default.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0008-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/8.4.0/0008-libgcc-disable-split-stack-nothreads.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0008-libgcc-disable-split-stack-nothreads.patch
rename to packages/gcc/8.4.0/0008-libgcc-disable-split-stack-nothreads.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0009-bionic-ndk.patch b/packages/gcc/8.4.0/0009-bionic-ndk.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0009-bionic-ndk.patch
rename to packages/gcc/8.4.0/0009-bionic-ndk.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0010-crystax.patch b/packages/gcc/8.4.0/0010-crystax.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0010-crystax.patch
rename to packages/gcc/8.4.0/0010-crystax.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0011-crystax.patch b/packages/gcc/8.4.0/0011-crystax.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0011-crystax.patch
rename to packages/gcc/8.4.0/0011-crystax.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0012-crystax.patch b/packages/gcc/8.4.0/0012-crystax.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0012-crystax.patch
rename to packages/gcc/8.4.0/0012-crystax.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0013-crystax.patch b/packages/gcc/8.4.0/0013-crystax.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0013-crystax.patch
rename to packages/gcc/8.4.0/0013-crystax.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0014-crystax.patch b/packages/gcc/8.4.0/0014-crystax.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0014-crystax.patch
rename to packages/gcc/8.4.0/0014-crystax.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0015-crystax.patch b/packages/gcc/8.4.0/0015-crystax.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0015-crystax.patch
rename to packages/gcc/8.4.0/0015-crystax.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0016-crystax.patch b/packages/gcc/8.4.0/0016-crystax.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0016-crystax.patch
rename to packages/gcc/8.4.0/0016-crystax.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0017-crystax.patch b/packages/gcc/8.4.0/0017-crystax.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0017-crystax.patch
rename to packages/gcc/8.4.0/0017-crystax.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0018-ARC-Add-multilib-support-for-linux-targets.patch b/packages/gcc/8.4.0/0018-ARC-Add-multilib-support-for-linux-targets.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0018-ARC-Add-multilib-support-for-linux-targets.patch
rename to packages/gcc/8.4.0/0018-ARC-Add-multilib-support-for-linux-targets.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0019-isl-0.20.patch b/packages/gcc/8.4.0/0019-isl-0.20.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0019-isl-0.20.patch
rename to packages/gcc/8.4.0/0019-isl-0.20.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0020-ARM-fix-cmse.patch b/packages/gcc/8.4.0/0020-ARM-fix-cmse.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0020-ARM-fix-cmse.patch
rename to packages/gcc/8.4.0/0020-ARM-fix-cmse.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0021-arm-Make-arm_cmse.h-C99-compatible.patch b/packages/gcc/8.4.0/0021-arm-Make-arm_cmse.h-C99-compatible.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0021-arm-Make-arm_cmse.h-C99-compatible.patch
rename to packages/gcc/8.4.0/0021-arm-Make-arm_cmse.h-C99-compatible.patch
diff --git a/packages/gcc/8.4.0/8.3.0/0022-ARC-Update-fma-expansions.patch b/packages/gcc/8.4.0/0022-ARC-Update-fma-expansions.patch
similarity index 100%
rename from packages/gcc/8.4.0/8.3.0/0022-ARC-Update-fma-expansions.patch
rename to packages/gcc/8.4.0/0022-ARC-Update-fma-expansions.patch