Synced repos to: 60642

diff --git a/binutils/binutils-2.21/COPYING b/COPYING
similarity index 100%
rename from binutils/binutils-2.21/COPYING
rename to COPYING

diff --git a/binutils/binutils-2.21/COPYING.LIB b/COPYING.LIB
similarity index 100%
rename from binutils/binutils-2.21/COPYING.LIB
rename to COPYING.LIB

diff --git a/binutils/binutils-2.21/COPYING3 b/COPYING3
similarity index 100%
rename from binutils/binutils-2.21/COPYING3
rename to COPYING3

diff --git a/binutils/binutils-2.21/COPYING3.LIB b/COPYING3.LIB
similarity index 100%
rename from binutils/binutils-2.21/COPYING3.LIB
rename to COPYING3.LIB

diff --git a/binutils/binutils-2.21/ChangeLog b/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/ChangeLog
rename to ChangeLog

diff --git a/binutils/binutils-2.21/MAINTAINERS b/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/MAINTAINERS
rename to MAINTAINERS

diff --git a/binutils/binutils-2.21/Makefile.def b/Makefile.def
similarity index 100%
rename from binutils/binutils-2.21/Makefile.def
rename to Makefile.def

diff --git a/binutils/binutils-2.21/Makefile.in b/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/Makefile.in
rename to Makefile.in

diff --git a/binutils/binutils-2.21/Makefile.tpl b/Makefile.tpl
similarity index 100%
rename from binutils/binutils-2.21/Makefile.tpl
rename to Makefile.tpl

diff --git a/binutils/binutils-2.21/README b/README
similarity index 100%
rename from binutils/binutils-2.21/README
rename to README

diff --git a/binutils/binutils-2.21/README-maintainer-mode b/README-maintainer-mode
similarity index 100%
rename from binutils/binutils-2.21/README-maintainer-mode
rename to README-maintainer-mode

diff --git a/binutils/binutils-2.21/bfd/COPYING b/bfd/COPYING
similarity index 100%
rename from binutils/binutils-2.21/bfd/COPYING
rename to bfd/COPYING

diff --git a/binutils/binutils-2.21/bfd/ChangeLog b/bfd/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog
rename to bfd/ChangeLog

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-0001 b/bfd/ChangeLog-0001
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-0001
rename to bfd/ChangeLog-0001

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-0203 b/bfd/ChangeLog-0203
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-0203
rename to bfd/ChangeLog-0203

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2004 b/bfd/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2004
rename to bfd/ChangeLog-2004

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2005 b/bfd/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2005
rename to bfd/ChangeLog-2005

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2006 b/bfd/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2006
rename to bfd/ChangeLog-2006

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2007 b/bfd/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2007
rename to bfd/ChangeLog-2007

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2008 b/bfd/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2008
rename to bfd/ChangeLog-2008

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2009 b/bfd/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2009
rename to bfd/ChangeLog-2009

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-9193 b/bfd/ChangeLog-9193
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-9193
rename to bfd/ChangeLog-9193

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-9495 b/bfd/ChangeLog-9495
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-9495
rename to bfd/ChangeLog-9495

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-9697 b/bfd/ChangeLog-9697
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-9697
rename to bfd/ChangeLog-9697

diff --git a/binutils/binutils-2.21/bfd/ChangeLog-9899 b/bfd/ChangeLog-9899
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-9899
rename to bfd/ChangeLog-9899

diff --git a/binutils/binutils-2.21/bfd/MAINTAINERS b/bfd/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/bfd/MAINTAINERS
rename to bfd/MAINTAINERS

diff --git a/binutils/binutils-2.21/bfd/Makefile.am b/bfd/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/bfd/Makefile.am
rename to bfd/Makefile.am

diff --git a/binutils/binutils-2.21/bfd/Makefile.in b/bfd/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/Makefile.in
rename to bfd/Makefile.in

diff --git a/binutils/binutils-2.21/bfd/PORTING b/bfd/PORTING
similarity index 100%
rename from binutils/binutils-2.21/bfd/PORTING
rename to bfd/PORTING

diff --git a/binutils/binutils-2.21/bfd/README b/bfd/README
similarity index 100%
rename from binutils/binutils-2.21/bfd/README
rename to bfd/README

diff --git a/binutils/binutils-2.21/bfd/TODO b/bfd/TODO
similarity index 100%
rename from binutils/binutils-2.21/bfd/TODO
rename to bfd/TODO

diff --git a/binutils/binutils-2.21/bfd/acinclude.m4 b/bfd/acinclude.m4
similarity index 100%
rename from binutils/binutils-2.21/bfd/acinclude.m4
rename to bfd/acinclude.m4

diff --git a/binutils/binutils-2.21/bfd/aclocal.m4 b/bfd/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/bfd/aclocal.m4
rename to bfd/aclocal.m4

diff --git a/binutils/binutils-2.21/bfd/aix386-core.c b/bfd/aix386-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aix386-core.c
rename to bfd/aix386-core.c

diff --git a/binutils/binutils-2.21/bfd/aix5ppc-core.c b/bfd/aix5ppc-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aix5ppc-core.c
rename to bfd/aix5ppc-core.c

diff --git a/binutils/binutils-2.21/bfd/aout-adobe.c b/bfd/aout-adobe.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-adobe.c
rename to bfd/aout-adobe.c

diff --git a/binutils/binutils-2.21/bfd/aout-arm.c b/bfd/aout-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-arm.c
rename to bfd/aout-arm.c

diff --git a/binutils/binutils-2.21/bfd/aout-cris.c b/bfd/aout-cris.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-cris.c
rename to bfd/aout-cris.c

diff --git a/binutils/binutils-2.21/bfd/aout-ns32k.c b/bfd/aout-ns32k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-ns32k.c
rename to bfd/aout-ns32k.c

diff --git a/binutils/binutils-2.21/bfd/aout-sparcle.c b/bfd/aout-sparcle.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-sparcle.c
rename to bfd/aout-sparcle.c

diff --git a/binutils/binutils-2.21/bfd/aout-target.h b/bfd/aout-target.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-target.h
rename to bfd/aout-target.h

diff --git a/binutils/binutils-2.21/bfd/aout-tic30.c b/bfd/aout-tic30.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-tic30.c
rename to bfd/aout-tic30.c

diff --git a/binutils/binutils-2.21/bfd/aout0.c b/bfd/aout0.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout0.c
rename to bfd/aout0.c

diff --git a/binutils/binutils-2.21/bfd/aout32.c b/bfd/aout32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout32.c
rename to bfd/aout32.c

diff --git a/binutils/binutils-2.21/bfd/aout64.c b/bfd/aout64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout64.c
rename to bfd/aout64.c

diff --git a/binutils/binutils-2.21/bfd/aoutf1.h b/bfd/aoutf1.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/aoutf1.h
rename to bfd/aoutf1.h

diff --git a/binutils/binutils-2.21/bfd/aoutx.h b/bfd/aoutx.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/aoutx.h
rename to bfd/aoutx.h

diff --git a/binutils/binutils-2.21/bfd/archive.c b/bfd/archive.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/archive.c
rename to bfd/archive.c

diff --git a/binutils/binutils-2.21/bfd/archive64.c b/bfd/archive64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/archive64.c
rename to bfd/archive64.c

diff --git a/binutils/binutils-2.21/bfd/archures.c b/bfd/archures.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/archures.c
rename to bfd/archures.c

diff --git a/binutils/binutils-2.21/bfd/armnetbsd.c b/bfd/armnetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/armnetbsd.c
rename to bfd/armnetbsd.c

diff --git a/binutils/binutils-2.21/bfd/bfd-in.h b/bfd/bfd-in.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfd-in.h
rename to bfd/bfd-in.h

diff --git a/binutils/binutils-2.21/bfd/bfd-in2.h b/bfd/bfd-in2.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfd-in2.h
rename to bfd/bfd-in2.h

diff --git a/binutils/binutils-2.21/bfd/bfd.c b/bfd/bfd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfd.c
rename to bfd/bfd.c

diff --git a/binutils/binutils-2.21/bfd/bfd.m4 b/bfd/bfd.m4
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfd.m4
rename to bfd/bfd.m4

diff --git a/binutils/binutils-2.21/bfd/bfdio.c b/bfd/bfdio.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfdio.c
rename to bfd/bfdio.c

diff --git a/binutils/binutils-2.21/bfd/bfdwin.c b/bfd/bfdwin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfdwin.c
rename to bfd/bfdwin.c

diff --git a/binutils/binutils-2.21/bfd/binary.c b/bfd/binary.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/binary.c
rename to bfd/binary.c

diff --git a/binutils/binutils-2.21/bfd/bout.c b/bfd/bout.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/bout.c
rename to bfd/bout.c

diff --git a/binutils/binutils-2.21/bfd/cache.c b/bfd/cache.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cache.c
rename to bfd/cache.c

diff --git a/binutils/binutils-2.21/bfd/cf-i386lynx.c b/bfd/cf-i386lynx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cf-i386lynx.c
rename to bfd/cf-i386lynx.c

diff --git a/binutils/binutils-2.21/bfd/cf-sparclynx.c b/bfd/cf-sparclynx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cf-sparclynx.c
rename to bfd/cf-sparclynx.c

diff --git a/binutils/binutils-2.21/bfd/cisco-core.c b/bfd/cisco-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cisco-core.c
rename to bfd/cisco-core.c

diff --git a/binutils/binutils-2.21/bfd/coff-alpha.c b/bfd/coff-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-alpha.c
rename to bfd/coff-alpha.c

diff --git a/binutils/binutils-2.21/bfd/coff-apollo.c b/bfd/coff-apollo.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-apollo.c
rename to bfd/coff-apollo.c

diff --git a/binutils/binutils-2.21/bfd/coff-arm.c b/bfd/coff-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-arm.c
rename to bfd/coff-arm.c

diff --git a/binutils/binutils-2.21/bfd/coff-aux.c b/bfd/coff-aux.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-aux.c
rename to bfd/coff-aux.c

diff --git a/binutils/binutils-2.21/bfd/coff-go32.c b/bfd/coff-go32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-go32.c
rename to bfd/coff-go32.c

diff --git a/binutils/binutils-2.21/bfd/coff-h8300.c b/bfd/coff-h8300.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-h8300.c
rename to bfd/coff-h8300.c

diff --git a/binutils/binutils-2.21/bfd/coff-h8500.c b/bfd/coff-h8500.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-h8500.c
rename to bfd/coff-h8500.c

diff --git a/binutils/binutils-2.21/bfd/coff-i386.c b/bfd/coff-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-i386.c
rename to bfd/coff-i386.c

diff --git a/binutils/binutils-2.21/bfd/coff-i860.c b/bfd/coff-i860.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-i860.c
rename to bfd/coff-i860.c

diff --git a/binutils/binutils-2.21/bfd/coff-i960.c b/bfd/coff-i960.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-i960.c
rename to bfd/coff-i960.c

diff --git a/binutils/binutils-2.21/bfd/coff-ia64.c b/bfd/coff-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-ia64.c
rename to bfd/coff-ia64.c

diff --git a/binutils/binutils-2.21/bfd/coff-m68k.c b/bfd/coff-m68k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-m68k.c
rename to bfd/coff-m68k.c

diff --git a/binutils/binutils-2.21/bfd/coff-m88k.c b/bfd/coff-m88k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-m88k.c
rename to bfd/coff-m88k.c

diff --git a/binutils/binutils-2.21/bfd/coff-mcore.c b/bfd/coff-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-mcore.c
rename to bfd/coff-mcore.c

diff --git a/binutils/binutils-2.21/bfd/coff-mips.c b/bfd/coff-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-mips.c
rename to bfd/coff-mips.c

diff --git a/binutils/binutils-2.21/bfd/coff-or32.c b/bfd/coff-or32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-or32.c
rename to bfd/coff-or32.c

diff --git a/binutils/binutils-2.21/bfd/coff-pmac.c b/bfd/coff-pmac.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-pmac.c
rename to bfd/coff-pmac.c

diff --git a/binutils/binutils-2.21/bfd/coff-ppc.c b/bfd/coff-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-ppc.c
rename to bfd/coff-ppc.c

diff --git a/binutils/binutils-2.21/bfd/coff-rs6000.c b/bfd/coff-rs6000.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-rs6000.c
rename to bfd/coff-rs6000.c

diff --git a/binutils/binutils-2.21/bfd/coff-sh.c b/bfd/coff-sh.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-sh.c
rename to bfd/coff-sh.c

diff --git a/binutils/binutils-2.21/bfd/coff-sparc.c b/bfd/coff-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-sparc.c
rename to bfd/coff-sparc.c

diff --git a/binutils/binutils-2.21/bfd/coff-stgo32.c b/bfd/coff-stgo32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-stgo32.c
rename to bfd/coff-stgo32.c

diff --git a/binutils/binutils-2.21/bfd/coff-svm68k.c b/bfd/coff-svm68k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-svm68k.c
rename to bfd/coff-svm68k.c

diff --git a/binutils/binutils-2.21/bfd/coff-tic30.c b/bfd/coff-tic30.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-tic30.c
rename to bfd/coff-tic30.c

diff --git a/binutils/binutils-2.21/bfd/coff-tic4x.c b/bfd/coff-tic4x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-tic4x.c
rename to bfd/coff-tic4x.c

diff --git a/binutils/binutils-2.21/bfd/coff-tic54x.c b/bfd/coff-tic54x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-tic54x.c
rename to bfd/coff-tic54x.c

diff --git a/binutils/binutils-2.21/bfd/coff-tic80.c b/bfd/coff-tic80.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-tic80.c
rename to bfd/coff-tic80.c

diff --git a/binutils/binutils-2.21/bfd/coff-u68k.c b/bfd/coff-u68k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-u68k.c
rename to bfd/coff-u68k.c

diff --git a/binutils/binutils-2.21/bfd/coff-w65.c b/bfd/coff-w65.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-w65.c
rename to bfd/coff-w65.c

diff --git a/binutils/binutils-2.21/bfd/coff-we32k.c b/bfd/coff-we32k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-we32k.c
rename to bfd/coff-we32k.c

diff --git a/binutils/binutils-2.21/bfd/coff-x86_64.c b/bfd/coff-x86_64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-x86_64.c
rename to bfd/coff-x86_64.c

diff --git a/binutils/binutils-2.21/bfd/coff-z80.c b/bfd/coff-z80.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-z80.c
rename to bfd/coff-z80.c

diff --git a/binutils/binutils-2.21/bfd/coff-z8k.c b/bfd/coff-z8k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-z8k.c
rename to bfd/coff-z8k.c

diff --git a/binutils/binutils-2.21/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff64-rs6000.c
rename to bfd/coff64-rs6000.c

diff --git a/binutils/binutils-2.21/bfd/coffcode.h b/bfd/coffcode.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/coffcode.h
rename to bfd/coffcode.h

diff --git a/binutils/binutils-2.21/bfd/coffgen.c b/bfd/coffgen.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coffgen.c
rename to bfd/coffgen.c

diff --git a/binutils/binutils-2.21/bfd/cofflink.c b/bfd/cofflink.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cofflink.c
rename to bfd/cofflink.c

diff --git a/binutils/binutils-2.21/bfd/coffswap.h b/bfd/coffswap.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/coffswap.h
rename to bfd/coffswap.h

diff --git a/binutils/binutils-2.21/bfd/compress.c b/bfd/compress.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/compress.c
rename to bfd/compress.c

diff --git a/binutils/binutils-2.21/bfd/config.bfd b/bfd/config.bfd
similarity index 100%
rename from binutils/binutils-2.21/bfd/config.bfd
rename to bfd/config.bfd

diff --git a/binutils/binutils-2.21/bfd/config.in b/bfd/config.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/config.in
rename to bfd/config.in

diff --git a/binutils/binutils-2.21/bfd/configure b/bfd/configure
similarity index 100%
rename from binutils/binutils-2.21/bfd/configure
rename to bfd/configure

diff --git a/binutils/binutils-2.21/bfd/configure.com b/bfd/configure.com
similarity index 100%
rename from binutils/binutils-2.21/bfd/configure.com
rename to bfd/configure.com

diff --git a/binutils/binutils-2.21/bfd/configure.host b/bfd/configure.host
similarity index 100%
rename from binutils/binutils-2.21/bfd/configure.host
rename to bfd/configure.host

diff --git a/binutils/binutils-2.21/bfd/configure.in b/bfd/configure.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/configure.in
rename to bfd/configure.in

diff --git a/binutils/binutils-2.21/bfd/corefile.c b/bfd/corefile.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/corefile.c
rename to bfd/corefile.c

diff --git a/binutils/binutils-2.21/bfd/cpu-alpha.c b/bfd/cpu-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-alpha.c
rename to bfd/cpu-alpha.c

diff --git a/binutils/binutils-2.21/bfd/cpu-arc.c b/bfd/cpu-arc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-arc.c
rename to bfd/cpu-arc.c

diff --git a/binutils/binutils-2.21/bfd/cpu-arm.c b/bfd/cpu-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-arm.c
rename to bfd/cpu-arm.c

diff --git a/binutils/binutils-2.21/bfd/cpu-avr.c b/bfd/cpu-avr.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-avr.c
rename to bfd/cpu-avr.c

diff --git a/binutils/binutils-2.21/bfd/cpu-bfin.c b/bfd/cpu-bfin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-bfin.c
rename to bfd/cpu-bfin.c

diff --git a/binutils/binutils-2.21/bfd/cpu-cr16.c b/bfd/cpu-cr16.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-cr16.c
rename to bfd/cpu-cr16.c

diff --git a/binutils/binutils-2.21/bfd/cpu-cr16c.c b/bfd/cpu-cr16c.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-cr16c.c
rename to bfd/cpu-cr16c.c

diff --git a/binutils/binutils-2.21/bfd/cpu-cris.c b/bfd/cpu-cris.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-cris.c
rename to bfd/cpu-cris.c

diff --git a/binutils/binutils-2.21/bfd/cpu-crx.c b/bfd/cpu-crx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-crx.c
rename to bfd/cpu-crx.c

diff --git a/binutils/binutils-2.21/bfd/cpu-d10v.c b/bfd/cpu-d10v.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-d10v.c
rename to bfd/cpu-d10v.c

diff --git a/binutils/binutils-2.21/bfd/cpu-d30v.c b/bfd/cpu-d30v.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-d30v.c
rename to bfd/cpu-d30v.c

diff --git a/binutils/binutils-2.21/bfd/cpu-dlx.c b/bfd/cpu-dlx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-dlx.c
rename to bfd/cpu-dlx.c

diff --git a/binutils/binutils-2.21/bfd/cpu-fr30.c b/bfd/cpu-fr30.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-fr30.c
rename to bfd/cpu-fr30.c

diff --git a/binutils/binutils-2.21/bfd/cpu-frv.c b/bfd/cpu-frv.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-frv.c
rename to bfd/cpu-frv.c

diff --git a/binutils/binutils-2.21/bfd/cpu-h8300.c b/bfd/cpu-h8300.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-h8300.c
rename to bfd/cpu-h8300.c

diff --git a/binutils/binutils-2.21/bfd/cpu-h8500.c b/bfd/cpu-h8500.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-h8500.c
rename to bfd/cpu-h8500.c

diff --git a/binutils/binutils-2.21/bfd/cpu-hppa.c b/bfd/cpu-hppa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-hppa.c
rename to bfd/cpu-hppa.c

diff --git a/binutils/binutils-2.21/bfd/cpu-i370.c b/bfd/cpu-i370.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-i370.c
rename to bfd/cpu-i370.c

diff --git a/binutils/binutils-2.21/bfd/cpu-i386.c b/bfd/cpu-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-i386.c
rename to bfd/cpu-i386.c

diff --git a/binutils/binutils-2.21/bfd/cpu-i860.c b/bfd/cpu-i860.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-i860.c
rename to bfd/cpu-i860.c

diff --git a/binutils/binutils-2.21/bfd/cpu-i960.c b/bfd/cpu-i960.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-i960.c
rename to bfd/cpu-i960.c

diff --git a/binutils/binutils-2.21/bfd/cpu-ia64-opc.c b/bfd/cpu-ia64-opc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-ia64-opc.c
rename to bfd/cpu-ia64-opc.c

diff --git a/binutils/binutils-2.21/bfd/cpu-ia64.c b/bfd/cpu-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-ia64.c
rename to bfd/cpu-ia64.c

diff --git a/binutils/binutils-2.21/bfd/cpu-ip2k.c b/bfd/cpu-ip2k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-ip2k.c
rename to bfd/cpu-ip2k.c

diff --git a/binutils/binutils-2.21/bfd/cpu-iq2000.c b/bfd/cpu-iq2000.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-iq2000.c
rename to bfd/cpu-iq2000.c

diff --git a/binutils/binutils-2.21/bfd/cpu-l1om.c b/bfd/cpu-l1om.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-l1om.c
rename to bfd/cpu-l1om.c

diff --git a/binutils/binutils-2.21/bfd/cpu-lm32.c b/bfd/cpu-lm32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-lm32.c
rename to bfd/cpu-lm32.c

diff --git a/binutils/binutils-2.21/bfd/cpu-m10200.c b/bfd/cpu-m10200.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m10200.c
rename to bfd/cpu-m10200.c

diff --git a/binutils/binutils-2.21/bfd/cpu-m10300.c b/bfd/cpu-m10300.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m10300.c
rename to bfd/cpu-m10300.c

diff --git a/binutils/binutils-2.21/bfd/cpu-m32c.c b/bfd/cpu-m32c.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m32c.c
rename to bfd/cpu-m32c.c

diff --git a/binutils/binutils-2.21/bfd/cpu-m32r.c b/bfd/cpu-m32r.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m32r.c
rename to bfd/cpu-m32r.c

diff --git a/binutils/binutils-2.21/bfd/cpu-m68hc11.c b/bfd/cpu-m68hc11.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m68hc11.c
rename to bfd/cpu-m68hc11.c

diff --git a/binutils/binutils-2.21/bfd/cpu-m68hc12.c b/bfd/cpu-m68hc12.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m68hc12.c
rename to bfd/cpu-m68hc12.c

diff --git a/binutils/binutils-2.21/bfd/cpu-m68k.c b/bfd/cpu-m68k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m68k.c
rename to bfd/cpu-m68k.c

diff --git a/binutils/binutils-2.21/bfd/cpu-m88k.c b/bfd/cpu-m88k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m88k.c
rename to bfd/cpu-m88k.c

diff --git a/binutils/binutils-2.21/bfd/cpu-mcore.c b/bfd/cpu-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-mcore.c
rename to bfd/cpu-mcore.c

diff --git a/binutils/binutils-2.21/bfd/cpu-mep.c b/bfd/cpu-mep.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-mep.c
rename to bfd/cpu-mep.c

diff --git a/binutils/binutils-2.21/bfd/cpu-microblaze.c b/bfd/cpu-microblaze.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-microblaze.c
rename to bfd/cpu-microblaze.c

diff --git a/binutils/binutils-2.21/bfd/cpu-mips.c b/bfd/cpu-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-mips.c
rename to bfd/cpu-mips.c

diff --git a/binutils/binutils-2.21/bfd/cpu-mmix.c b/bfd/cpu-mmix.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-mmix.c
rename to bfd/cpu-mmix.c

diff --git a/binutils/binutils-2.21/bfd/cpu-moxie.c b/bfd/cpu-moxie.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-moxie.c
rename to bfd/cpu-moxie.c

diff --git a/binutils/binutils-2.21/bfd/cpu-msp430.c b/bfd/cpu-msp430.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-msp430.c
rename to bfd/cpu-msp430.c

diff --git a/binutils/binutils-2.21/bfd/cpu-mt.c b/bfd/cpu-mt.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-mt.c
rename to bfd/cpu-mt.c

diff --git a/binutils/binutils-2.21/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-ns32k.c
rename to bfd/cpu-ns32k.c

diff --git a/binutils/binutils-2.21/bfd/cpu-openrisc.c b/bfd/cpu-openrisc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-openrisc.c
rename to bfd/cpu-openrisc.c

diff --git a/binutils/binutils-2.21/bfd/cpu-or32.c b/bfd/cpu-or32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-or32.c
rename to bfd/cpu-or32.c

diff --git a/binutils/binutils-2.21/bfd/cpu-pdp11.c b/bfd/cpu-pdp11.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-pdp11.c
rename to bfd/cpu-pdp11.c

diff --git a/binutils/binutils-2.21/bfd/cpu-pj.c b/bfd/cpu-pj.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-pj.c
rename to bfd/cpu-pj.c

diff --git a/binutils/binutils-2.21/bfd/cpu-plugin.c b/bfd/cpu-plugin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-plugin.c
rename to bfd/cpu-plugin.c

diff --git a/binutils/binutils-2.21/bfd/cpu-powerpc.c b/bfd/cpu-powerpc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-powerpc.c
rename to bfd/cpu-powerpc.c

diff --git a/binutils/binutils-2.21/bfd/cpu-rs6000.c b/bfd/cpu-rs6000.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-rs6000.c
rename to bfd/cpu-rs6000.c

diff --git a/binutils/binutils-2.21/bfd/cpu-rx.c b/bfd/cpu-rx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-rx.c
rename to bfd/cpu-rx.c

diff --git a/binutils/binutils-2.21/bfd/cpu-s390.c b/bfd/cpu-s390.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-s390.c
rename to bfd/cpu-s390.c

diff --git a/binutils/binutils-2.21/bfd/cpu-score.c b/bfd/cpu-score.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-score.c
rename to bfd/cpu-score.c

diff --git a/binutils/binutils-2.21/bfd/cpu-sh.c b/bfd/cpu-sh.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-sh.c
rename to bfd/cpu-sh.c

diff --git a/binutils/binutils-2.21/bfd/cpu-sparc.c b/bfd/cpu-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-sparc.c
rename to bfd/cpu-sparc.c

diff --git a/binutils/binutils-2.21/bfd/cpu-spu.c b/bfd/cpu-spu.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-spu.c
rename to bfd/cpu-spu.c

diff --git a/binutils/binutils-2.21/bfd/cpu-tic30.c b/bfd/cpu-tic30.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-tic30.c
rename to bfd/cpu-tic30.c

diff --git a/binutils/binutils-2.21/bfd/cpu-tic4x.c b/bfd/cpu-tic4x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-tic4x.c
rename to bfd/cpu-tic4x.c

diff --git a/binutils/binutils-2.21/bfd/cpu-tic54x.c b/bfd/cpu-tic54x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-tic54x.c
rename to bfd/cpu-tic54x.c

diff --git a/binutils/binutils-2.21/bfd/cpu-tic6x.c b/bfd/cpu-tic6x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-tic6x.c
rename to bfd/cpu-tic6x.c

diff --git a/binutils/binutils-2.21/bfd/cpu-tic80.c b/bfd/cpu-tic80.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-tic80.c
rename to bfd/cpu-tic80.c

diff --git a/binutils/binutils-2.21/bfd/cpu-v850.c b/bfd/cpu-v850.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-v850.c
rename to bfd/cpu-v850.c

diff --git a/binutils/binutils-2.21/bfd/cpu-vax.c b/bfd/cpu-vax.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-vax.c
rename to bfd/cpu-vax.c

diff --git a/binutils/binutils-2.21/bfd/cpu-w65.c b/bfd/cpu-w65.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-w65.c
rename to bfd/cpu-w65.c

diff --git a/binutils/binutils-2.21/bfd/cpu-we32k.c b/bfd/cpu-we32k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-we32k.c
rename to bfd/cpu-we32k.c

diff --git a/binutils/binutils-2.21/bfd/cpu-xc16x.c b/bfd/cpu-xc16x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-xc16x.c
rename to bfd/cpu-xc16x.c

diff --git a/binutils/binutils-2.21/bfd/cpu-xstormy16.c b/bfd/cpu-xstormy16.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-xstormy16.c
rename to bfd/cpu-xstormy16.c

diff --git a/binutils/binutils-2.21/bfd/cpu-xtensa.c b/bfd/cpu-xtensa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-xtensa.c
rename to bfd/cpu-xtensa.c

diff --git a/binutils/binutils-2.21/bfd/cpu-z80.c b/bfd/cpu-z80.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-z80.c
rename to bfd/cpu-z80.c

diff --git a/binutils/binutils-2.21/bfd/cpu-z8k.c b/bfd/cpu-z8k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-z8k.c
rename to bfd/cpu-z8k.c

diff --git a/binutils/binutils-2.21/bfd/demo64.c b/bfd/demo64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/demo64.c
rename to bfd/demo64.c

diff --git a/binutils/binutils-2.21/bfd/dep-in.sed b/bfd/dep-in.sed
similarity index 100%
rename from binutils/binutils-2.21/bfd/dep-in.sed
rename to bfd/dep-in.sed

diff --git a/binutils/binutils-2.21/bfd/doc/ChangeLog b/bfd/doc/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/ChangeLog
rename to bfd/doc/ChangeLog

diff --git a/binutils/binutils-2.21/bfd/doc/ChangeLog-9103 b/bfd/doc/ChangeLog-9103
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/ChangeLog-9103
rename to bfd/doc/ChangeLog-9103

diff --git a/binutils/binutils-2.21/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/Makefile.am
rename to bfd/doc/Makefile.am

diff --git a/binutils/binutils-2.21/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/Makefile.in
rename to bfd/doc/Makefile.in

diff --git a/binutils/binutils-2.21/bfd/doc/aoutx.texi b/bfd/doc/aoutx.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/aoutx.texi
rename to bfd/doc/aoutx.texi

diff --git a/binutils/binutils-2.21/bfd/doc/archive.texi b/bfd/doc/archive.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/archive.texi
rename to bfd/doc/archive.texi

diff --git a/binutils/binutils-2.21/bfd/doc/archures.texi b/bfd/doc/archures.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/archures.texi
rename to bfd/doc/archures.texi

diff --git a/binutils/binutils-2.21/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfd.texinfo
rename to bfd/doc/bfd.texinfo

diff --git a/binutils/binutils-2.21/bfd/doc/bfdint.texi b/bfd/doc/bfdint.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdint.texi
rename to bfd/doc/bfdint.texi

diff --git a/binutils/binutils-2.21/bfd/doc/bfdio.texi b/bfd/doc/bfdio.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdio.texi
rename to bfd/doc/bfdio.texi

diff --git a/binutils/binutils-2.21/bfd/doc/bfdsumm.texi b/bfd/doc/bfdsumm.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdsumm.texi
rename to bfd/doc/bfdsumm.texi

diff --git a/binutils/binutils-2.21/bfd/doc/bfdt.texi b/bfd/doc/bfdt.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdt.texi
rename to bfd/doc/bfdt.texi

diff --git a/binutils/binutils-2.21/bfd/doc/bfdver.texi b/bfd/doc/bfdver.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdver.texi
rename to bfd/doc/bfdver.texi

diff --git a/binutils/binutils-2.21/bfd/doc/bfdwin.texi b/bfd/doc/bfdwin.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdwin.texi
rename to bfd/doc/bfdwin.texi

diff --git a/binutils/binutils-2.21/bfd/doc/cache.texi b/bfd/doc/cache.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/cache.texi
rename to bfd/doc/cache.texi

diff --git a/binutils/binutils-2.21/bfd/doc/chew.c b/bfd/doc/chew.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/chew.c
rename to bfd/doc/chew.c

diff --git a/binutils/binutils-2.21/bfd/doc/coffcode.texi b/bfd/doc/coffcode.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/coffcode.texi
rename to bfd/doc/coffcode.texi

diff --git a/binutils/binutils-2.21/bfd/doc/core.texi b/bfd/doc/core.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/core.texi
rename to bfd/doc/core.texi

diff --git a/binutils/binutils-2.21/bfd/doc/doc.str b/bfd/doc/doc.str
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/doc.str
rename to bfd/doc/doc.str

diff --git a/binutils/binutils-2.21/bfd/doc/elf.texi b/bfd/doc/elf.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/elf.texi
rename to bfd/doc/elf.texi

diff --git a/binutils/binutils-2.21/bfd/doc/elfcode.texi b/bfd/doc/elfcode.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/elfcode.texi
rename to bfd/doc/elfcode.texi

diff --git a/binutils/binutils-2.21/bfd/doc/fdl.texi b/bfd/doc/fdl.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/fdl.texi
rename to bfd/doc/fdl.texi

diff --git a/binutils/binutils-2.21/bfd/doc/format.texi b/bfd/doc/format.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/format.texi
rename to bfd/doc/format.texi

diff --git a/binutils/binutils-2.21/bfd/doc/hash.texi b/bfd/doc/hash.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/hash.texi
rename to bfd/doc/hash.texi

diff --git a/binutils/binutils-2.21/bfd/doc/header.sed b/bfd/doc/header.sed
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/header.sed
rename to bfd/doc/header.sed

diff --git a/binutils/binutils-2.21/bfd/doc/init.texi b/bfd/doc/init.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/init.texi
rename to bfd/doc/init.texi

diff --git a/binutils/binutils-2.21/bfd/doc/libbfd.texi b/bfd/doc/libbfd.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/libbfd.texi
rename to bfd/doc/libbfd.texi

diff --git a/binutils/binutils-2.21/bfd/doc/linker.texi b/bfd/doc/linker.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/linker.texi
rename to bfd/doc/linker.texi

diff --git a/binutils/binutils-2.21/bfd/doc/makefile.vms b/bfd/doc/makefile.vms
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/makefile.vms
rename to bfd/doc/makefile.vms

diff --git a/binutils/binutils-2.21/bfd/doc/mmo.texi b/bfd/doc/mmo.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/mmo.texi
rename to bfd/doc/mmo.texi

diff --git a/binutils/binutils-2.21/bfd/doc/opncls.texi b/bfd/doc/opncls.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/opncls.texi
rename to bfd/doc/opncls.texi

diff --git a/binutils/binutils-2.21/bfd/doc/proto.str b/bfd/doc/proto.str
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/proto.str
rename to bfd/doc/proto.str

diff --git a/binutils/binutils-2.21/bfd/doc/reloc.texi b/bfd/doc/reloc.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/reloc.texi
rename to bfd/doc/reloc.texi

diff --git a/binutils/binutils-2.21/bfd/doc/section.texi b/bfd/doc/section.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/section.texi
rename to bfd/doc/section.texi

diff --git a/binutils/binutils-2.21/bfd/doc/syms.texi b/bfd/doc/syms.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/syms.texi
rename to bfd/doc/syms.texi

diff --git a/binutils/binutils-2.21/bfd/doc/targets.texi b/bfd/doc/targets.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/targets.texi
rename to bfd/doc/targets.texi

diff --git a/binutils/binutils-2.21/bfd/dwarf1.c b/bfd/dwarf1.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/dwarf1.c
rename to bfd/dwarf1.c

diff --git a/binutils/binutils-2.21/bfd/dwarf2.c b/bfd/dwarf2.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/dwarf2.c
rename to bfd/dwarf2.c

diff --git a/binutils/binutils-2.21/bfd/ecoff.c b/bfd/ecoff.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ecoff.c
rename to bfd/ecoff.c

diff --git a/binutils/binutils-2.21/bfd/ecofflink.c b/bfd/ecofflink.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ecofflink.c
rename to bfd/ecofflink.c

diff --git a/binutils/binutils-2.21/bfd/ecoffswap.h b/bfd/ecoffswap.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/ecoffswap.h
rename to bfd/ecoffswap.h

diff --git a/binutils/binutils-2.21/bfd/elf-attrs.c b/bfd/elf-attrs.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-attrs.c
rename to bfd/elf-attrs.c

diff --git a/binutils/binutils-2.21/bfd/elf-bfd.h b/bfd/elf-bfd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-bfd.h
rename to bfd/elf-bfd.h

diff --git a/binutils/binutils-2.21/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-eh-frame.c
rename to bfd/elf-eh-frame.c

diff --git a/binutils/binutils-2.21/bfd/elf-hppa.h b/bfd/elf-hppa.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-hppa.h
rename to bfd/elf-hppa.h

diff --git a/binutils/binutils-2.21/bfd/elf-ifunc.c b/bfd/elf-ifunc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-ifunc.c
rename to bfd/elf-ifunc.c

diff --git a/binutils/binutils-2.21/bfd/elf-m10200.c b/bfd/elf-m10200.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-m10200.c
rename to bfd/elf-m10200.c

diff --git a/binutils/binutils-2.21/bfd/elf-m10300.c b/bfd/elf-m10300.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-m10300.c
rename to bfd/elf-m10300.c

diff --git a/binutils/binutils-2.21/bfd/elf-strtab.c b/bfd/elf-strtab.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-strtab.c
rename to bfd/elf-strtab.c

diff --git a/binutils/binutils-2.21/bfd/elf-vxworks.c b/bfd/elf-vxworks.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-vxworks.c
rename to bfd/elf-vxworks.c

diff --git a/binutils/binutils-2.21/bfd/elf-vxworks.h b/bfd/elf-vxworks.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-vxworks.h
rename to bfd/elf-vxworks.h

diff --git a/binutils/binutils-2.21/bfd/elf.c b/bfd/elf.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf.c
rename to bfd/elf.c

diff --git a/binutils/binutils-2.21/bfd/elf32-am33lin.c b/bfd/elf32-am33lin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-am33lin.c
rename to bfd/elf32-am33lin.c

diff --git a/binutils/binutils-2.21/bfd/elf32-arc.c b/bfd/elf32-arc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-arc.c
rename to bfd/elf32-arc.c

diff --git a/binutils/binutils-2.21/bfd/elf32-arm.c b/bfd/elf32-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-arm.c
rename to bfd/elf32-arm.c

diff --git a/binutils/binutils-2.21/bfd/elf32-avr.c b/bfd/elf32-avr.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-avr.c
rename to bfd/elf32-avr.c

diff --git a/binutils/binutils-2.21/bfd/elf32-avr.h b/bfd/elf32-avr.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-avr.h
rename to bfd/elf32-avr.h

diff --git a/binutils/binutils-2.21/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-bfin.c
rename to bfd/elf32-bfin.c

diff --git a/binutils/binutils-2.21/bfd/elf32-cr16.c b/bfd/elf32-cr16.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-cr16.c
rename to bfd/elf32-cr16.c

diff --git a/binutils/binutils-2.21/bfd/elf32-cr16c.c b/bfd/elf32-cr16c.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-cr16c.c
rename to bfd/elf32-cr16c.c

diff --git a/binutils/binutils-2.21/bfd/elf32-cris.c b/bfd/elf32-cris.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-cris.c
rename to bfd/elf32-cris.c

diff --git a/binutils/binutils-2.21/bfd/elf32-crx.c b/bfd/elf32-crx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-crx.c
rename to bfd/elf32-crx.c

diff --git a/binutils/binutils-2.21/bfd/elf32-d10v.c b/bfd/elf32-d10v.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-d10v.c
rename to bfd/elf32-d10v.c

diff --git a/binutils/binutils-2.21/bfd/elf32-d30v.c b/bfd/elf32-d30v.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-d30v.c
rename to bfd/elf32-d30v.c

diff --git a/binutils/binutils-2.21/bfd/elf32-dlx.c b/bfd/elf32-dlx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-dlx.c
rename to bfd/elf32-dlx.c

diff --git a/binutils/binutils-2.21/bfd/elf32-fr30.c b/bfd/elf32-fr30.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-fr30.c
rename to bfd/elf32-fr30.c

diff --git a/binutils/binutils-2.21/bfd/elf32-frv.c b/bfd/elf32-frv.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-frv.c
rename to bfd/elf32-frv.c

diff --git a/binutils/binutils-2.21/bfd/elf32-gen.c b/bfd/elf32-gen.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-gen.c
rename to bfd/elf32-gen.c

diff --git a/binutils/binutils-2.21/bfd/elf32-h8300.c b/bfd/elf32-h8300.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-h8300.c
rename to bfd/elf32-h8300.c

diff --git a/binutils/binutils-2.21/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-hppa.c
rename to bfd/elf32-hppa.c

diff --git a/binutils/binutils-2.21/bfd/elf32-hppa.h b/bfd/elf32-hppa.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-hppa.h
rename to bfd/elf32-hppa.h

diff --git a/binutils/binutils-2.21/bfd/elf32-i370.c b/bfd/elf32-i370.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-i370.c
rename to bfd/elf32-i370.c

diff --git a/binutils/binutils-2.21/bfd/elf32-i386.c b/bfd/elf32-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-i386.c
rename to bfd/elf32-i386.c

diff --git a/binutils/binutils-2.21/bfd/elf32-i860.c b/bfd/elf32-i860.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-i860.c
rename to bfd/elf32-i860.c

diff --git a/binutils/binutils-2.21/bfd/elf32-i960.c b/bfd/elf32-i960.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-i960.c
rename to bfd/elf32-i960.c

diff --git a/binutils/binutils-2.21/bfd/elf32-ip2k.c b/bfd/elf32-ip2k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-ip2k.c
rename to bfd/elf32-ip2k.c

diff --git a/binutils/binutils-2.21/bfd/elf32-iq2000.c b/bfd/elf32-iq2000.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-iq2000.c
rename to bfd/elf32-iq2000.c

diff --git a/binutils/binutils-2.21/bfd/elf32-lm32.c b/bfd/elf32-lm32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-lm32.c
rename to bfd/elf32-lm32.c

diff --git a/binutils/binutils-2.21/bfd/elf32-m32c.c b/bfd/elf32-m32c.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m32c.c
rename to bfd/elf32-m32c.c

diff --git a/binutils/binutils-2.21/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m32r.c
rename to bfd/elf32-m32r.c

diff --git a/binutils/binutils-2.21/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m68hc11.c
rename to bfd/elf32-m68hc11.c

diff --git a/binutils/binutils-2.21/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m68hc12.c
rename to bfd/elf32-m68hc12.c

diff --git a/binutils/binutils-2.21/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m68hc1x.c
rename to bfd/elf32-m68hc1x.c

diff --git a/binutils/binutils-2.21/bfd/elf32-m68hc1x.h b/bfd/elf32-m68hc1x.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m68hc1x.h
rename to bfd/elf32-m68hc1x.h

diff --git a/binutils/binutils-2.21/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m68k.c
rename to bfd/elf32-m68k.c

diff --git a/binutils/binutils-2.21/bfd/elf32-m88k.c b/bfd/elf32-m88k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m88k.c
rename to bfd/elf32-m88k.c

diff --git a/binutils/binutils-2.21/bfd/elf32-mcore.c b/bfd/elf32-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-mcore.c
rename to bfd/elf32-mcore.c

diff --git a/binutils/binutils-2.21/bfd/elf32-mep.c b/bfd/elf32-mep.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-mep.c
rename to bfd/elf32-mep.c

diff --git a/binutils/binutils-2.21/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-microblaze.c
rename to bfd/elf32-microblaze.c

diff --git a/binutils/binutils-2.21/bfd/elf32-mips.c b/bfd/elf32-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-mips.c
rename to bfd/elf32-mips.c

diff --git a/binutils/binutils-2.21/bfd/elf32-moxie.c b/bfd/elf32-moxie.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-moxie.c
rename to bfd/elf32-moxie.c

diff --git a/binutils/binutils-2.21/bfd/elf32-msp430.c b/bfd/elf32-msp430.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-msp430.c
rename to bfd/elf32-msp430.c

diff --git a/binutils/binutils-2.21/bfd/elf32-mt.c b/bfd/elf32-mt.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-mt.c
rename to bfd/elf32-mt.c

diff --git a/binutils/binutils-2.21/bfd/elf32-openrisc.c b/bfd/elf32-openrisc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-openrisc.c
rename to bfd/elf32-openrisc.c

diff --git a/binutils/binutils-2.21/bfd/elf32-or32.c b/bfd/elf32-or32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-or32.c
rename to bfd/elf32-or32.c

diff --git a/binutils/binutils-2.21/bfd/elf32-pj.c b/bfd/elf32-pj.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-pj.c
rename to bfd/elf32-pj.c

diff --git a/binutils/binutils-2.21/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-ppc.c
rename to bfd/elf32-ppc.c

diff --git a/binutils/binutils-2.21/bfd/elf32-ppc.h b/bfd/elf32-ppc.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-ppc.h
rename to bfd/elf32-ppc.h

diff --git a/binutils/binutils-2.21/bfd/elf32-rx.c b/bfd/elf32-rx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-rx.c
rename to bfd/elf32-rx.c

diff --git a/binutils/binutils-2.21/bfd/elf32-s390.c b/bfd/elf32-s390.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-s390.c
rename to bfd/elf32-s390.c

diff --git a/binutils/binutils-2.21/bfd/elf32-score.c b/bfd/elf32-score.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-score.c
rename to bfd/elf32-score.c

diff --git a/binutils/binutils-2.21/bfd/elf32-score.h b/bfd/elf32-score.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-score.h
rename to bfd/elf32-score.h

diff --git a/binutils/binutils-2.21/bfd/elf32-score7.c b/bfd/elf32-score7.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-score7.c
rename to bfd/elf32-score7.c

diff --git a/binutils/binutils-2.21/bfd/elf32-sh-relocs.h b/bfd/elf32-sh-relocs.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh-relocs.h
rename to bfd/elf32-sh-relocs.h

diff --git a/binutils/binutils-2.21/bfd/elf32-sh-symbian.c b/bfd/elf32-sh-symbian.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh-symbian.c
rename to bfd/elf32-sh-symbian.c

diff --git a/binutils/binutils-2.21/bfd/elf32-sh.c b/bfd/elf32-sh.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh.c
rename to bfd/elf32-sh.c

diff --git a/binutils/binutils-2.21/bfd/elf32-sh64-com.c b/bfd/elf32-sh64-com.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh64-com.c
rename to bfd/elf32-sh64-com.c

diff --git a/binutils/binutils-2.21/bfd/elf32-sh64.c b/bfd/elf32-sh64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh64.c
rename to bfd/elf32-sh64.c

diff --git a/binutils/binutils-2.21/bfd/elf32-sh64.h b/bfd/elf32-sh64.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh64.h
rename to bfd/elf32-sh64.h

diff --git a/binutils/binutils-2.21/bfd/elf32-sparc.c b/bfd/elf32-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sparc.c
rename to bfd/elf32-sparc.c

diff --git a/binutils/binutils-2.21/bfd/elf32-spu.c b/bfd/elf32-spu.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-spu.c
rename to bfd/elf32-spu.c

diff --git a/binutils/binutils-2.21/bfd/elf32-spu.h b/bfd/elf32-spu.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-spu.h
rename to bfd/elf32-spu.h

diff --git a/binutils/binutils-2.21/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-tic6x.c
rename to bfd/elf32-tic6x.c

diff --git a/binutils/binutils-2.21/bfd/elf32-tic6x.h b/bfd/elf32-tic6x.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-tic6x.h
rename to bfd/elf32-tic6x.h

diff --git a/binutils/binutils-2.21/bfd/elf32-v850.c b/bfd/elf32-v850.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-v850.c
rename to bfd/elf32-v850.c

diff --git a/binutils/binutils-2.21/bfd/elf32-vax.c b/bfd/elf32-vax.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-vax.c
rename to bfd/elf32-vax.c

diff --git a/binutils/binutils-2.21/bfd/elf32-xc16x.c b/bfd/elf32-xc16x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-xc16x.c
rename to bfd/elf32-xc16x.c

diff --git a/binutils/binutils-2.21/bfd/elf32-xstormy16.c b/bfd/elf32-xstormy16.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-xstormy16.c
rename to bfd/elf32-xstormy16.c

diff --git a/binutils/binutils-2.21/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-xtensa.c
rename to bfd/elf32-xtensa.c

diff --git a/binutils/binutils-2.21/bfd/elf32.c b/bfd/elf32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32.c
rename to bfd/elf32.c

diff --git a/binutils/binutils-2.21/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-alpha.c
rename to bfd/elf64-alpha.c

diff --git a/binutils/binutils-2.21/bfd/elf64-gen.c b/bfd/elf64-gen.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-gen.c
rename to bfd/elf64-gen.c

diff --git a/binutils/binutils-2.21/bfd/elf64-hppa.c b/bfd/elf64-hppa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-hppa.c
rename to bfd/elf64-hppa.c

diff --git a/binutils/binutils-2.21/bfd/elf64-hppa.h b/bfd/elf64-hppa.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-hppa.h
rename to bfd/elf64-hppa.h

diff --git a/binutils/binutils-2.21/bfd/elf64-mips.c b/bfd/elf64-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-mips.c
rename to bfd/elf64-mips.c

diff --git a/binutils/binutils-2.21/bfd/elf64-mmix.c b/bfd/elf64-mmix.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-mmix.c
rename to bfd/elf64-mmix.c

diff --git a/binutils/binutils-2.21/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-ppc.c
rename to bfd/elf64-ppc.c

diff --git a/binutils/binutils-2.21/bfd/elf64-ppc.h b/bfd/elf64-ppc.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-ppc.h
rename to bfd/elf64-ppc.h

diff --git a/binutils/binutils-2.21/bfd/elf64-s390.c b/bfd/elf64-s390.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-s390.c
rename to bfd/elf64-s390.c

diff --git a/binutils/binutils-2.21/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-sh64.c
rename to bfd/elf64-sh64.c

diff --git a/binutils/binutils-2.21/bfd/elf64-sparc.c b/bfd/elf64-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-sparc.c
rename to bfd/elf64-sparc.c

diff --git a/binutils/binutils-2.21/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-x86-64.c
rename to bfd/elf64-x86-64.c

diff --git a/binutils/binutils-2.21/bfd/elf64.c b/bfd/elf64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64.c
rename to bfd/elf64.c

diff --git a/binutils/binutils-2.21/bfd/elfcode.h b/bfd/elfcode.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfcode.h
rename to bfd/elfcode.h

diff --git a/binutils/binutils-2.21/bfd/elfcore.h b/bfd/elfcore.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfcore.h
rename to bfd/elfcore.h

diff --git a/binutils/binutils-2.21/bfd/elflink.c b/bfd/elflink.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elflink.c
rename to bfd/elflink.c

diff --git a/binutils/binutils-2.21/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfn32-mips.c
rename to bfd/elfn32-mips.c

diff --git a/binutils/binutils-2.21/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-ia64.c
rename to bfd/elfxx-ia64.c

diff --git a/binutils/binutils-2.21/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-mips.c
rename to bfd/elfxx-mips.c

diff --git a/binutils/binutils-2.21/bfd/elfxx-mips.h b/bfd/elfxx-mips.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-mips.h
rename to bfd/elfxx-mips.h

diff --git a/binutils/binutils-2.21/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-sparc.c
rename to bfd/elfxx-sparc.c

diff --git a/binutils/binutils-2.21/bfd/elfxx-sparc.h b/bfd/elfxx-sparc.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-sparc.h
rename to bfd/elfxx-sparc.h

diff --git a/binutils/binutils-2.21/bfd/elfxx-target.h b/bfd/elfxx-target.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-target.h
rename to bfd/elfxx-target.h

diff --git a/binutils/binutils-2.21/bfd/epoc-pe-arm.c b/bfd/epoc-pe-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/epoc-pe-arm.c
rename to bfd/epoc-pe-arm.c

diff --git a/binutils/binutils-2.21/bfd/epoc-pei-arm.c b/bfd/epoc-pei-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/epoc-pei-arm.c
rename to bfd/epoc-pei-arm.c

diff --git a/binutils/binutils-2.21/bfd/format.c b/bfd/format.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/format.c
rename to bfd/format.c

diff --git a/binutils/binutils-2.21/bfd/freebsd.h b/bfd/freebsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/freebsd.h
rename to bfd/freebsd.h

diff --git a/binutils/binutils-2.21/bfd/gen-aout.c b/bfd/gen-aout.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/gen-aout.c
rename to bfd/gen-aout.c

diff --git a/binutils/binutils-2.21/bfd/genlink.h b/bfd/genlink.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/genlink.h
rename to bfd/genlink.h

diff --git a/binutils/binutils-2.21/bfd/go32stub.h b/bfd/go32stub.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/go32stub.h
rename to bfd/go32stub.h

diff --git a/binutils/binutils-2.21/bfd/hash.c b/bfd/hash.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/hash.c
rename to bfd/hash.c

diff --git a/binutils/binutils-2.21/bfd/host-aout.c b/bfd/host-aout.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/host-aout.c
rename to bfd/host-aout.c

diff --git a/binutils/binutils-2.21/bfd/hosts/alphalinux.h b/bfd/hosts/alphalinux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/alphalinux.h
rename to bfd/hosts/alphalinux.h

diff --git a/binutils/binutils-2.21/bfd/hosts/alphavms.h b/bfd/hosts/alphavms.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/alphavms.h
rename to bfd/hosts/alphavms.h

diff --git a/binutils/binutils-2.21/bfd/hosts/decstation.h b/bfd/hosts/decstation.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/decstation.h
rename to bfd/hosts/decstation.h

diff --git a/binutils/binutils-2.21/bfd/hosts/delta68.h b/bfd/hosts/delta68.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/delta68.h
rename to bfd/hosts/delta68.h

diff --git a/binutils/binutils-2.21/bfd/hosts/dpx2.h b/bfd/hosts/dpx2.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/dpx2.h
rename to bfd/hosts/dpx2.h

diff --git a/binutils/binutils-2.21/bfd/hosts/hp300bsd.h b/bfd/hosts/hp300bsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/hp300bsd.h
rename to bfd/hosts/hp300bsd.h

diff --git a/binutils/binutils-2.21/bfd/hosts/i386bsd.h b/bfd/hosts/i386bsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/i386bsd.h
rename to bfd/hosts/i386bsd.h

diff --git a/binutils/binutils-2.21/bfd/hosts/i386linux.h b/bfd/hosts/i386linux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/i386linux.h
rename to bfd/hosts/i386linux.h

diff --git a/binutils/binutils-2.21/bfd/hosts/i386mach3.h b/bfd/hosts/i386mach3.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/i386mach3.h
rename to bfd/hosts/i386mach3.h

diff --git a/binutils/binutils-2.21/bfd/hosts/i386sco.h b/bfd/hosts/i386sco.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/i386sco.h
rename to bfd/hosts/i386sco.h

diff --git a/binutils/binutils-2.21/bfd/hosts/i860mach3.h b/bfd/hosts/i860mach3.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/i860mach3.h
rename to bfd/hosts/i860mach3.h

diff --git a/binutils/binutils-2.21/bfd/hosts/m68kaux.h b/bfd/hosts/m68kaux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/m68kaux.h
rename to bfd/hosts/m68kaux.h

diff --git a/binutils/binutils-2.21/bfd/hosts/m68klinux.h b/bfd/hosts/m68klinux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/m68klinux.h
rename to bfd/hosts/m68klinux.h

diff --git a/binutils/binutils-2.21/bfd/hosts/m88kmach3.h b/bfd/hosts/m88kmach3.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/m88kmach3.h
rename to bfd/hosts/m88kmach3.h

diff --git a/binutils/binutils-2.21/bfd/hosts/mipsbsd.h b/bfd/hosts/mipsbsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/mipsbsd.h
rename to bfd/hosts/mipsbsd.h

diff --git a/binutils/binutils-2.21/bfd/hosts/mipsmach3.h b/bfd/hosts/mipsmach3.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/mipsmach3.h
rename to bfd/hosts/mipsmach3.h

diff --git a/binutils/binutils-2.21/bfd/hosts/news-mips.h b/bfd/hosts/news-mips.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/news-mips.h
rename to bfd/hosts/news-mips.h

diff --git a/binutils/binutils-2.21/bfd/hosts/news.h b/bfd/hosts/news.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/news.h
rename to bfd/hosts/news.h

diff --git a/binutils/binutils-2.21/bfd/hosts/pc532mach.h b/bfd/hosts/pc532mach.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/pc532mach.h
rename to bfd/hosts/pc532mach.h

diff --git a/binutils/binutils-2.21/bfd/hosts/riscos.h b/bfd/hosts/riscos.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/riscos.h
rename to bfd/hosts/riscos.h

diff --git a/binutils/binutils-2.21/bfd/hosts/symmetry.h b/bfd/hosts/symmetry.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/symmetry.h
rename to bfd/hosts/symmetry.h

diff --git a/binutils/binutils-2.21/bfd/hosts/tahoe.h b/bfd/hosts/tahoe.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/tahoe.h
rename to bfd/hosts/tahoe.h

diff --git a/binutils/binutils-2.21/bfd/hosts/vaxbsd.h b/bfd/hosts/vaxbsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/vaxbsd.h
rename to bfd/hosts/vaxbsd.h

diff --git a/binutils/binutils-2.21/bfd/hosts/vaxlinux.h b/bfd/hosts/vaxlinux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/vaxlinux.h
rename to bfd/hosts/vaxlinux.h

diff --git a/binutils/binutils-2.21/bfd/hosts/vaxult.h b/bfd/hosts/vaxult.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/vaxult.h
rename to bfd/hosts/vaxult.h

diff --git a/binutils/binutils-2.21/bfd/hosts/vaxult2.h b/bfd/hosts/vaxult2.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/vaxult2.h
rename to bfd/hosts/vaxult2.h

diff --git a/binutils/binutils-2.21/bfd/hosts/x86-64linux.h b/bfd/hosts/x86-64linux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/x86-64linux.h
rename to bfd/hosts/x86-64linux.h

diff --git a/binutils/binutils-2.21/bfd/hp300bsd.c b/bfd/hp300bsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/hp300bsd.c
rename to bfd/hp300bsd.c

diff --git a/binutils/binutils-2.21/bfd/hp300hpux.c b/bfd/hp300hpux.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/hp300hpux.c
rename to bfd/hp300hpux.c

diff --git a/binutils/binutils-2.21/bfd/hppabsd-core.c b/bfd/hppabsd-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/hppabsd-core.c
rename to bfd/hppabsd-core.c

diff --git a/binutils/binutils-2.21/bfd/hpux-core.c b/bfd/hpux-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/hpux-core.c
rename to bfd/hpux-core.c

diff --git a/binutils/binutils-2.21/bfd/i386aout.c b/bfd/i386aout.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386aout.c
rename to bfd/i386aout.c

diff --git a/binutils/binutils-2.21/bfd/i386bsd.c b/bfd/i386bsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386bsd.c
rename to bfd/i386bsd.c

diff --git a/binutils/binutils-2.21/bfd/i386dynix.c b/bfd/i386dynix.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386dynix.c
rename to bfd/i386dynix.c

diff --git a/binutils/binutils-2.21/bfd/i386freebsd.c b/bfd/i386freebsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386freebsd.c
rename to bfd/i386freebsd.c

diff --git a/binutils/binutils-2.21/bfd/i386linux.c b/bfd/i386linux.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386linux.c
rename to bfd/i386linux.c

diff --git a/binutils/binutils-2.21/bfd/i386lynx.c b/bfd/i386lynx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386lynx.c
rename to bfd/i386lynx.c

diff --git a/binutils/binutils-2.21/bfd/i386mach3.c b/bfd/i386mach3.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386mach3.c
rename to bfd/i386mach3.c

diff --git a/binutils/binutils-2.21/bfd/i386msdos.c b/bfd/i386msdos.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386msdos.c
rename to bfd/i386msdos.c

diff --git a/binutils/binutils-2.21/bfd/i386netbsd.c b/bfd/i386netbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386netbsd.c
rename to bfd/i386netbsd.c

diff --git a/binutils/binutils-2.21/bfd/i386os9k.c b/bfd/i386os9k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386os9k.c
rename to bfd/i386os9k.c

diff --git a/binutils/binutils-2.21/bfd/ieee.c b/bfd/ieee.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ieee.c
rename to bfd/ieee.c

diff --git a/binutils/binutils-2.21/bfd/ihex.c b/bfd/ihex.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ihex.c
rename to bfd/ihex.c

diff --git a/binutils/binutils-2.21/bfd/init.c b/bfd/init.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/init.c
rename to bfd/init.c

diff --git a/binutils/binutils-2.21/bfd/irix-core.c b/bfd/irix-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/irix-core.c
rename to bfd/irix-core.c

diff --git a/binutils/binutils-2.21/bfd/libaout.h b/bfd/libaout.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libaout.h
rename to bfd/libaout.h

diff --git a/binutils/binutils-2.21/bfd/libbfd-in.h b/bfd/libbfd-in.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libbfd-in.h
rename to bfd/libbfd-in.h

diff --git a/binutils/binutils-2.21/bfd/libbfd.c b/bfd/libbfd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/libbfd.c
rename to bfd/libbfd.c

diff --git a/binutils/binutils-2.21/bfd/libbfd.h b/bfd/libbfd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libbfd.h
rename to bfd/libbfd.h

diff --git a/binutils/binutils-2.21/bfd/libcoff-in.h b/bfd/libcoff-in.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libcoff-in.h
rename to bfd/libcoff-in.h

diff --git a/binutils/binutils-2.21/bfd/libcoff.h b/bfd/libcoff.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libcoff.h
rename to bfd/libcoff.h

diff --git a/binutils/binutils-2.21/bfd/libecoff.h b/bfd/libecoff.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libecoff.h
rename to bfd/libecoff.h

diff --git a/binutils/binutils-2.21/bfd/libhppa.h b/bfd/libhppa.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libhppa.h
rename to bfd/libhppa.h

diff --git a/binutils/binutils-2.21/bfd/libieee.h b/bfd/libieee.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libieee.h
rename to bfd/libieee.h

diff --git a/binutils/binutils-2.21/bfd/libnlm.h b/bfd/libnlm.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libnlm.h
rename to bfd/libnlm.h

diff --git a/binutils/binutils-2.21/bfd/liboasys.h b/bfd/liboasys.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/liboasys.h
rename to bfd/liboasys.h

diff --git a/binutils/binutils-2.21/bfd/libpei.h b/bfd/libpei.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libpei.h
rename to bfd/libpei.h

diff --git a/binutils/binutils-2.21/bfd/libxcoff.h b/bfd/libxcoff.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libxcoff.h
rename to bfd/libxcoff.h

diff --git a/binutils/binutils-2.21/bfd/linker.c b/bfd/linker.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/linker.c
rename to bfd/linker.c

diff --git a/binutils/binutils-2.21/bfd/lynx-core.c b/bfd/lynx-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/lynx-core.c
rename to bfd/lynx-core.c

diff --git a/binutils/binutils-2.21/bfd/m68k4knetbsd.c b/bfd/m68k4knetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/m68k4knetbsd.c
rename to bfd/m68k4knetbsd.c

diff --git a/binutils/binutils-2.21/bfd/m68klinux.c b/bfd/m68klinux.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/m68klinux.c
rename to bfd/m68klinux.c

diff --git a/binutils/binutils-2.21/bfd/m68knetbsd.c b/bfd/m68knetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/m68knetbsd.c
rename to bfd/m68knetbsd.c

diff --git a/binutils/binutils-2.21/bfd/m88kmach3.c b/bfd/m88kmach3.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/m88kmach3.c
rename to bfd/m88kmach3.c

diff --git a/binutils/binutils-2.21/bfd/m88kopenbsd.c b/bfd/m88kopenbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/m88kopenbsd.c
rename to bfd/m88kopenbsd.c

diff --git a/binutils/binutils-2.21/bfd/mach-o-i386.c b/bfd/mach-o-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mach-o-i386.c
rename to bfd/mach-o-i386.c

diff --git a/binutils/binutils-2.21/bfd/mach-o-target.c b/bfd/mach-o-target.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mach-o-target.c
rename to bfd/mach-o-target.c

diff --git a/binutils/binutils-2.21/bfd/mach-o-x86-64.c b/bfd/mach-o-x86-64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mach-o-x86-64.c
rename to bfd/mach-o-x86-64.c

diff --git a/binutils/binutils-2.21/bfd/mach-o.c b/bfd/mach-o.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mach-o.c
rename to bfd/mach-o.c

diff --git a/binutils/binutils-2.21/bfd/mach-o.h b/bfd/mach-o.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/mach-o.h
rename to bfd/mach-o.h

diff --git a/binutils/binutils-2.21/bfd/makefile.vms b/bfd/makefile.vms
similarity index 100%
rename from binutils/binutils-2.21/bfd/makefile.vms
rename to bfd/makefile.vms

diff --git a/binutils/binutils-2.21/bfd/mep-relocs.pl b/bfd/mep-relocs.pl
similarity index 100%
rename from binutils/binutils-2.21/bfd/mep-relocs.pl
rename to bfd/mep-relocs.pl

diff --git a/binutils/binutils-2.21/bfd/merge.c b/bfd/merge.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/merge.c
rename to bfd/merge.c

diff --git a/binutils/binutils-2.21/bfd/mipsbsd.c b/bfd/mipsbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mipsbsd.c
rename to bfd/mipsbsd.c

diff --git a/binutils/binutils-2.21/bfd/mmo.c b/bfd/mmo.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mmo.c
rename to bfd/mmo.c

diff --git a/binutils/binutils-2.21/bfd/netbsd-core.c b/bfd/netbsd-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/netbsd-core.c
rename to bfd/netbsd-core.c

diff --git a/binutils/binutils-2.21/bfd/netbsd.h b/bfd/netbsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/netbsd.h
rename to bfd/netbsd.h

diff --git a/binutils/binutils-2.21/bfd/newsos3.c b/bfd/newsos3.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/newsos3.c
rename to bfd/newsos3.c

diff --git a/binutils/binutils-2.21/bfd/nlm-target.h b/bfd/nlm-target.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm-target.h
rename to bfd/nlm-target.h

diff --git a/binutils/binutils-2.21/bfd/nlm.c b/bfd/nlm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm.c
rename to bfd/nlm.c

diff --git a/binutils/binutils-2.21/bfd/nlm32-alpha.c b/bfd/nlm32-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm32-alpha.c
rename to bfd/nlm32-alpha.c

diff --git a/binutils/binutils-2.21/bfd/nlm32-i386.c b/bfd/nlm32-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm32-i386.c
rename to bfd/nlm32-i386.c

diff --git a/binutils/binutils-2.21/bfd/nlm32-ppc.c b/bfd/nlm32-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm32-ppc.c
rename to bfd/nlm32-ppc.c

diff --git a/binutils/binutils-2.21/bfd/nlm32-sparc.c b/bfd/nlm32-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm32-sparc.c
rename to bfd/nlm32-sparc.c

diff --git a/binutils/binutils-2.21/bfd/nlm32.c b/bfd/nlm32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm32.c
rename to bfd/nlm32.c

diff --git a/binutils/binutils-2.21/bfd/nlm64.c b/bfd/nlm64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm64.c
rename to bfd/nlm64.c

diff --git a/binutils/binutils-2.21/bfd/nlmcode.h b/bfd/nlmcode.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlmcode.h
rename to bfd/nlmcode.h

diff --git a/binutils/binutils-2.21/bfd/nlmswap.h b/bfd/nlmswap.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlmswap.h
rename to bfd/nlmswap.h

diff --git a/binutils/binutils-2.21/bfd/ns32k.h b/bfd/ns32k.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/ns32k.h
rename to bfd/ns32k.h

diff --git a/binutils/binutils-2.21/bfd/ns32knetbsd.c b/bfd/ns32knetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ns32knetbsd.c
rename to bfd/ns32knetbsd.c

diff --git a/binutils/binutils-2.21/bfd/oasys.c b/bfd/oasys.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/oasys.c
rename to bfd/oasys.c

diff --git a/binutils/binutils-2.21/bfd/opncls.c b/bfd/opncls.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/opncls.c
rename to bfd/opncls.c

diff --git a/binutils/binutils-2.21/bfd/osf-core.c b/bfd/osf-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/osf-core.c
rename to bfd/osf-core.c

diff --git a/binutils/binutils-2.21/bfd/pc532-mach.c b/bfd/pc532-mach.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pc532-mach.c
rename to bfd/pc532-mach.c

diff --git a/binutils/binutils-2.21/bfd/pdp11.c b/bfd/pdp11.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pdp11.c
rename to bfd/pdp11.c

diff --git a/binutils/binutils-2.21/bfd/pe-arm-wince.c b/bfd/pe-arm-wince.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-arm-wince.c
rename to bfd/pe-arm-wince.c

diff --git a/binutils/binutils-2.21/bfd/pe-arm.c b/bfd/pe-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-arm.c
rename to bfd/pe-arm.c

diff --git a/binutils/binutils-2.21/bfd/pe-i386.c b/bfd/pe-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-i386.c
rename to bfd/pe-i386.c

diff --git a/binutils/binutils-2.21/bfd/pe-mcore.c b/bfd/pe-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-mcore.c
rename to bfd/pe-mcore.c

diff --git a/binutils/binutils-2.21/bfd/pe-mips.c b/bfd/pe-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-mips.c
rename to bfd/pe-mips.c

diff --git a/binutils/binutils-2.21/bfd/pe-ppc.c b/bfd/pe-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-ppc.c
rename to bfd/pe-ppc.c

diff --git a/binutils/binutils-2.21/bfd/pe-sh.c b/bfd/pe-sh.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-sh.c
rename to bfd/pe-sh.c

diff --git a/binutils/binutils-2.21/bfd/pe-x86_64.c b/bfd/pe-x86_64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-x86_64.c
rename to bfd/pe-x86_64.c

diff --git a/binutils/binutils-2.21/bfd/peXXigen.c b/bfd/peXXigen.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/peXXigen.c
rename to bfd/peXXigen.c

diff --git a/binutils/binutils-2.21/bfd/pef-traceback.h b/bfd/pef-traceback.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/pef-traceback.h
rename to bfd/pef-traceback.h

diff --git a/binutils/binutils-2.21/bfd/pef.c b/bfd/pef.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pef.c
rename to bfd/pef.c

diff --git a/binutils/binutils-2.21/bfd/pef.h b/bfd/pef.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/pef.h
rename to bfd/pef.h

diff --git a/binutils/binutils-2.21/bfd/pei-arm-wince.c b/bfd/pei-arm-wince.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-arm-wince.c
rename to bfd/pei-arm-wince.c

diff --git a/binutils/binutils-2.21/bfd/pei-arm.c b/bfd/pei-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-arm.c
rename to bfd/pei-arm.c

diff --git a/binutils/binutils-2.21/bfd/pei-i386.c b/bfd/pei-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-i386.c
rename to bfd/pei-i386.c

diff --git a/binutils/binutils-2.21/bfd/pei-ia64.c b/bfd/pei-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-ia64.c
rename to bfd/pei-ia64.c

diff --git a/binutils/binutils-2.21/bfd/pei-mcore.c b/bfd/pei-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-mcore.c
rename to bfd/pei-mcore.c

diff --git a/binutils/binutils-2.21/bfd/pei-mips.c b/bfd/pei-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-mips.c
rename to bfd/pei-mips.c

diff --git a/binutils/binutils-2.21/bfd/pei-ppc.c b/bfd/pei-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-ppc.c
rename to bfd/pei-ppc.c

diff --git a/binutils/binutils-2.21/bfd/pei-sh.c b/bfd/pei-sh.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-sh.c
rename to bfd/pei-sh.c

diff --git a/binutils/binutils-2.21/bfd/pei-x86_64.c b/bfd/pei-x86_64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-x86_64.c
rename to bfd/pei-x86_64.c

diff --git a/binutils/binutils-2.21/bfd/peicode.h b/bfd/peicode.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/peicode.h
rename to bfd/peicode.h

diff --git a/binutils/binutils-2.21/bfd/plugin.c b/bfd/plugin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/plugin.c
rename to bfd/plugin.c

diff --git a/binutils/binutils-2.21/bfd/plugin.h b/bfd/plugin.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/plugin.h
rename to bfd/plugin.h

diff --git a/binutils/binutils-2.21/bfd/po/BLD-POTFILES.in b/bfd/po/BLD-POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/BLD-POTFILES.in
rename to bfd/po/BLD-POTFILES.in

diff --git a/binutils/binutils-2.21/bfd/po/Make-in b/bfd/po/Make-in
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/Make-in
rename to bfd/po/Make-in

diff --git a/binutils/binutils-2.21/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/SRC-POTFILES.in
rename to bfd/po/SRC-POTFILES.in

diff --git a/binutils/binutils-2.21/bfd/po/bfd.pot b/bfd/po/bfd.pot
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/bfd.pot
rename to bfd/po/bfd.pot

diff --git a/binutils/binutils-2.21/bfd/po/da.gmo b/bfd/po/da.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/da.gmo
rename to bfd/po/da.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/da.po b/bfd/po/da.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/da.po
rename to bfd/po/da.po

diff --git a/binutils/binutils-2.21/bfd/po/es.gmo b/bfd/po/es.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/es.gmo
rename to bfd/po/es.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/es.po b/bfd/po/es.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/es.po
rename to bfd/po/es.po

diff --git a/binutils/binutils-2.21/bfd/po/fi.gmo b/bfd/po/fi.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/fi.gmo
rename to bfd/po/fi.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/fi.po b/bfd/po/fi.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/fi.po
rename to bfd/po/fi.po

diff --git a/binutils/binutils-2.21/bfd/po/fr.gmo b/bfd/po/fr.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/fr.gmo
rename to bfd/po/fr.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/fr.po b/bfd/po/fr.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/fr.po
rename to bfd/po/fr.po

diff --git a/binutils/binutils-2.21/bfd/po/id.gmo b/bfd/po/id.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/id.gmo
rename to bfd/po/id.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/id.po b/bfd/po/id.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/id.po
rename to bfd/po/id.po

diff --git a/binutils/binutils-2.21/bfd/po/ja.gmo b/bfd/po/ja.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ja.gmo
rename to bfd/po/ja.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/ja.po b/bfd/po/ja.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ja.po
rename to bfd/po/ja.po

diff --git a/binutils/binutils-2.21/bfd/po/ro.gmo b/bfd/po/ro.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ro.gmo
rename to bfd/po/ro.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/ro.po b/bfd/po/ro.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ro.po
rename to bfd/po/ro.po

diff --git a/binutils/binutils-2.21/bfd/po/ru.gmo b/bfd/po/ru.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ru.gmo
rename to bfd/po/ru.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/ru.po b/bfd/po/ru.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ru.po
rename to bfd/po/ru.po

diff --git a/binutils/binutils-2.21/bfd/po/rw.gmo b/bfd/po/rw.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/rw.gmo
rename to bfd/po/rw.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/rw.po b/bfd/po/rw.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/rw.po
rename to bfd/po/rw.po

diff --git a/binutils/binutils-2.21/bfd/po/sv.gmo b/bfd/po/sv.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/sv.gmo
rename to bfd/po/sv.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/sv.po b/bfd/po/sv.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/sv.po
rename to bfd/po/sv.po

diff --git a/binutils/binutils-2.21/bfd/po/tr.gmo b/bfd/po/tr.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/tr.gmo
rename to bfd/po/tr.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/tr.po b/bfd/po/tr.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/tr.po
rename to bfd/po/tr.po

diff --git a/binutils/binutils-2.21/bfd/po/vi.gmo b/bfd/po/vi.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/vi.gmo
rename to bfd/po/vi.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/vi.po b/bfd/po/vi.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/vi.po
rename to bfd/po/vi.po

diff --git a/binutils/binutils-2.21/bfd/po/zh_CN.gmo b/bfd/po/zh_CN.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/zh_CN.gmo
rename to bfd/po/zh_CN.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/bfd/po/zh_CN.po b/bfd/po/zh_CN.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/zh_CN.po
rename to bfd/po/zh_CN.po

diff --git a/binutils/binutils-2.21/bfd/ppcboot.c b/bfd/ppcboot.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ppcboot.c
rename to bfd/ppcboot.c

diff --git a/binutils/binutils-2.21/bfd/ptrace-core.c b/bfd/ptrace-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ptrace-core.c
rename to bfd/ptrace-core.c

diff --git a/binutils/binutils-2.21/bfd/reloc.c b/bfd/reloc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/reloc.c
rename to bfd/reloc.c

diff --git a/binutils/binutils-2.21/bfd/reloc16.c b/bfd/reloc16.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/reloc16.c
rename to bfd/reloc16.c

diff --git a/binutils/binutils-2.21/bfd/riscix.c b/bfd/riscix.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/riscix.c
rename to bfd/riscix.c

diff --git a/binutils/binutils-2.21/bfd/rs6000-core.c b/bfd/rs6000-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/rs6000-core.c
rename to bfd/rs6000-core.c

diff --git a/binutils/binutils-2.21/bfd/sco5-core.c b/bfd/sco5-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/sco5-core.c
rename to bfd/sco5-core.c

diff --git a/binutils/binutils-2.21/bfd/section.c b/bfd/section.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/section.c
rename to bfd/section.c

diff --git a/binutils/binutils-2.21/bfd/simple.c b/bfd/simple.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/simple.c
rename to bfd/simple.c

diff --git a/binutils/binutils-2.21/bfd/som.c b/bfd/som.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/som.c
rename to bfd/som.c

diff --git a/binutils/binutils-2.21/bfd/som.h b/bfd/som.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/som.h
rename to bfd/som.h

diff --git a/binutils/binutils-2.21/bfd/sparclinux.c b/bfd/sparclinux.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/sparclinux.c
rename to bfd/sparclinux.c

diff --git a/binutils/binutils-2.21/bfd/sparclynx.c b/bfd/sparclynx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/sparclynx.c
rename to bfd/sparclynx.c

diff --git a/binutils/binutils-2.21/bfd/sparcnetbsd.c b/bfd/sparcnetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/sparcnetbsd.c
rename to bfd/sparcnetbsd.c

diff --git a/binutils/binutils-2.21/bfd/srec.c b/bfd/srec.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/srec.c
rename to bfd/srec.c

diff --git a/binutils/binutils-2.21/bfd/stab-syms.c b/bfd/stab-syms.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/stab-syms.c
rename to bfd/stab-syms.c

diff --git a/binutils/binutils-2.21/bfd/stabs.c b/bfd/stabs.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/stabs.c
rename to bfd/stabs.c

diff --git a/binutils/binutils-2.21/bfd/stamp-h.in b/bfd/stamp-h.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/stamp-h.in
rename to bfd/stamp-h.in

diff --git a/binutils/binutils-2.21/bfd/sunos.c b/bfd/sunos.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/sunos.c
rename to bfd/sunos.c

diff --git a/binutils/binutils-2.21/bfd/syms.c b/bfd/syms.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/syms.c
rename to bfd/syms.c

diff --git a/binutils/binutils-2.21/bfd/sysdep.h b/bfd/sysdep.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/sysdep.h
rename to bfd/sysdep.h

diff --git a/binutils/binutils-2.21/bfd/targets.c b/bfd/targets.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/targets.c
rename to bfd/targets.c

diff --git a/binutils/binutils-2.21/bfd/targmatch.sed b/bfd/targmatch.sed
similarity index 100%
rename from binutils/binutils-2.21/bfd/targmatch.sed
rename to bfd/targmatch.sed

diff --git a/binutils/binutils-2.21/bfd/tekhex.c b/bfd/tekhex.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/tekhex.c
rename to bfd/tekhex.c

diff --git a/binutils/binutils-2.21/bfd/ticoff.h b/bfd/ticoff.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/ticoff.h
rename to bfd/ticoff.h

diff --git a/binutils/binutils-2.21/bfd/trad-core.c b/bfd/trad-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/trad-core.c
rename to bfd/trad-core.c

diff --git a/binutils/binutils-2.21/bfd/vax1knetbsd.c b/bfd/vax1knetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vax1knetbsd.c
rename to bfd/vax1knetbsd.c

diff --git a/binutils/binutils-2.21/bfd/vaxbsd.c b/bfd/vaxbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vaxbsd.c
rename to bfd/vaxbsd.c

diff --git a/binutils/binutils-2.21/bfd/vaxnetbsd.c b/bfd/vaxnetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vaxnetbsd.c
rename to bfd/vaxnetbsd.c

diff --git a/binutils/binutils-2.21/bfd/verilog.c b/bfd/verilog.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/verilog.c
rename to bfd/verilog.c

diff --git a/binutils/binutils-2.21/bfd/versados.c b/bfd/versados.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/versados.c
rename to bfd/versados.c

diff --git a/binutils/binutils-2.21/bfd/version.h b/bfd/version.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/version.h
rename to bfd/version.h

diff --git a/binutils/binutils-2.21/bfd/vms-alpha.c b/bfd/vms-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vms-alpha.c
rename to bfd/vms-alpha.c

diff --git a/binutils/binutils-2.21/bfd/vms-lib.c b/bfd/vms-lib.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vms-lib.c
rename to bfd/vms-lib.c

diff --git a/binutils/binutils-2.21/bfd/vms-misc.c b/bfd/vms-misc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vms-misc.c
rename to bfd/vms-misc.c

diff --git a/binutils/binutils-2.21/bfd/vms.h b/bfd/vms.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/vms.h
rename to bfd/vms.h

diff --git a/binutils/binutils-2.21/bfd/warning.m4 b/bfd/warning.m4
similarity index 100%
rename from binutils/binutils-2.21/bfd/warning.m4
rename to bfd/warning.m4

diff --git a/binutils/binutils-2.21/bfd/xcoff-target.h b/bfd/xcoff-target.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/xcoff-target.h
rename to bfd/xcoff-target.h

diff --git a/binutils/binutils-2.21/bfd/xcofflink.c b/bfd/xcofflink.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/xcofflink.c
rename to bfd/xcofflink.c

diff --git a/binutils/binutils-2.21/bfd/xsym.c b/bfd/xsym.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/xsym.c
rename to bfd/xsym.c

diff --git a/binutils/binutils-2.21/bfd/xsym.h b/bfd/xsym.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/xsym.h
rename to bfd/xsym.h

diff --git a/binutils/binutils-2.21/bfd/xtensa-isa.c b/bfd/xtensa-isa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/xtensa-isa.c
rename to bfd/xtensa-isa.c

diff --git a/binutils/binutils-2.21/bfd/xtensa-modules.c b/bfd/xtensa-modules.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/xtensa-modules.c
rename to bfd/xtensa-modules.c

diff --git a/binutils/binutils-2.21/binutils/BRANCHES b/binutils/BRANCHES
similarity index 100%
rename from binutils/binutils-2.21/binutils/BRANCHES
rename to binutils/BRANCHES

diff --git a/binutils/binutils-2.21/binutils/ChangeLog b/binutils/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog
rename to binutils/ChangeLog

diff --git a/binutils/binutils-2.21/binutils/ChangeLog-0001 b/binutils/ChangeLog-0001
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-0001
rename to binutils/ChangeLog-0001

diff --git a/binutils/binutils-2.21/binutils/ChangeLog-0203 b/binutils/ChangeLog-0203
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-0203
rename to binutils/ChangeLog-0203

diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2004 b/binutils/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2004
rename to binutils/ChangeLog-2004

diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2005 b/binutils/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2005
rename to binutils/ChangeLog-2005

diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2006 b/binutils/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2006
rename to binutils/ChangeLog-2006

diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2007 b/binutils/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2007
rename to binutils/ChangeLog-2007

diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2008 b/binutils/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2008
rename to binutils/ChangeLog-2008

diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2009 b/binutils/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2009
rename to binutils/ChangeLog-2009

diff --git a/binutils/binutils-2.21/binutils/ChangeLog-9197 b/binutils/ChangeLog-9197
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-9197
rename to binutils/ChangeLog-9197

diff --git a/binutils/binutils-2.21/binutils/ChangeLog-9899 b/binutils/ChangeLog-9899
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-9899
rename to binutils/ChangeLog-9899

diff --git a/binutils/binutils-2.21/binutils/MAINTAINERS b/binutils/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/binutils/MAINTAINERS
rename to binutils/MAINTAINERS

diff --git a/binutils/binutils-2.21/binutils/Makefile.am b/binutils/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/binutils/Makefile.am
rename to binutils/Makefile.am

diff --git a/binutils/binutils-2.21/binutils/Makefile.in b/binutils/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/Makefile.in
rename to binutils/Makefile.in

diff --git a/binutils/binutils-2.21/binutils/NEWS b/binutils/NEWS
similarity index 100%
rename from binutils/binutils-2.21/binutils/NEWS
rename to binutils/NEWS

diff --git a/binutils/binutils-2.21/binutils/README b/binutils/README
similarity index 100%
rename from binutils/binutils-2.21/binutils/README
rename to binutils/README

diff --git a/binutils/binutils-2.21/binutils/aclocal.m4 b/binutils/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/binutils/aclocal.m4
rename to binutils/aclocal.m4

diff --git a/binutils/binutils-2.21/binutils/addr2line.c b/binutils/addr2line.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/addr2line.c
rename to binutils/addr2line.c

diff --git a/binutils/binutils-2.21/binutils/ar.c b/binutils/ar.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/ar.c
rename to binutils/ar.c

diff --git a/binutils/binutils-2.21/binutils/arlex.c b/binutils/arlex.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/arlex.c
rename to binutils/arlex.c

diff --git a/binutils/binutils-2.21/binutils/arlex.l b/binutils/arlex.l
similarity index 100%
rename from binutils/binutils-2.21/binutils/arlex.l
rename to binutils/arlex.l

diff --git a/binutils/binutils-2.21/binutils/arparse.c b/binutils/arparse.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/arparse.c
rename to binutils/arparse.c

diff --git a/binutils/binutils-2.21/binutils/arparse.h b/binutils/arparse.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/arparse.h
rename to binutils/arparse.h

diff --git a/binutils/binutils-2.21/binutils/arparse.y b/binutils/arparse.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/arparse.y
rename to binutils/arparse.y

diff --git a/binutils/binutils-2.21/binutils/arsup.c b/binutils/arsup.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/arsup.c
rename to binutils/arsup.c

diff --git a/binutils/binutils-2.21/binutils/arsup.h b/binutils/arsup.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/arsup.h
rename to binutils/arsup.h

diff --git a/binutils/binutils-2.21/binutils/bin2c.c b/binutils/bin2c.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/bin2c.c
rename to binutils/bin2c.c

diff --git a/binutils/binutils-2.21/binutils/binemul.c b/binutils/binemul.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/binemul.c
rename to binutils/binemul.c

diff --git a/binutils/binutils-2.21/binutils/binemul.h b/binutils/binemul.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/binemul.h
rename to binutils/binemul.h

diff --git a/binutils/binutils-2.21/binutils/bucomm.c b/binutils/bucomm.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/bucomm.c
rename to binutils/bucomm.c

diff --git a/binutils/binutils-2.21/binutils/bucomm.h b/binutils/bucomm.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/bucomm.h
rename to binutils/bucomm.h

diff --git a/binutils/binutils-2.21/binutils/budbg.h b/binutils/budbg.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/budbg.h
rename to binutils/budbg.h

diff --git a/binutils/binutils-2.21/binutils/coffdump.c b/binutils/coffdump.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/coffdump.c
rename to binutils/coffdump.c

diff --git a/binutils/binutils-2.21/binutils/coffgrok.c b/binutils/coffgrok.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/coffgrok.c
rename to binutils/coffgrok.c

diff --git a/binutils/binutils-2.21/binutils/coffgrok.h b/binutils/coffgrok.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/coffgrok.h
rename to binutils/coffgrok.h

diff --git a/binutils/binutils-2.21/binutils/config.in b/binutils/config.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/config.in
rename to binutils/config.in

diff --git a/binutils/binutils-2.21/binutils/configure b/binutils/configure
similarity index 100%
rename from binutils/binutils-2.21/binutils/configure
rename to binutils/configure

diff --git a/binutils/binutils-2.21/binutils/configure.com b/binutils/configure.com
similarity index 100%
rename from binutils/binutils-2.21/binutils/configure.com
rename to binutils/configure.com

diff --git a/binutils/binutils-2.21/binutils/configure.in b/binutils/configure.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/configure.in
rename to binutils/configure.in

diff --git a/binutils/binutils-2.21/binutils/configure.tgt b/binutils/configure.tgt
similarity index 100%
rename from binutils/binutils-2.21/binutils/configure.tgt
rename to binutils/configure.tgt

diff --git a/binutils/binutils-2.21/binutils/cxxfilt.c b/binutils/cxxfilt.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/cxxfilt.c
rename to binutils/cxxfilt.c

diff --git a/binutils/binutils-2.21/binutils/debug.c b/binutils/debug.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/debug.c
rename to binutils/debug.c

diff --git a/binutils/binutils-2.21/binutils/debug.h b/binutils/debug.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/debug.h
rename to binutils/debug.h

diff --git a/binutils/binutils-2.21/binutils/deflex.c b/binutils/deflex.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/deflex.c
rename to binutils/deflex.c

diff --git a/binutils/binutils-2.21/binutils/deflex.l b/binutils/deflex.l
similarity index 100%
rename from binutils/binutils-2.21/binutils/deflex.l
rename to binutils/deflex.l

diff --git a/binutils/binutils-2.21/binutils/defparse.c b/binutils/defparse.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/defparse.c
rename to binutils/defparse.c

diff --git a/binutils/binutils-2.21/binutils/defparse.h b/binutils/defparse.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/defparse.h
rename to binutils/defparse.h

diff --git a/binutils/binutils-2.21/binutils/defparse.y b/binutils/defparse.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/defparse.y
rename to binutils/defparse.y

diff --git a/binutils/binutils-2.21/binutils/dep-in.sed b/binutils/dep-in.sed
similarity index 100%
rename from binutils/binutils-2.21/binutils/dep-in.sed
rename to binutils/dep-in.sed

diff --git a/binutils/binutils-2.21/binutils/dlltool.c b/binutils/dlltool.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/dlltool.c
rename to binutils/dlltool.c

diff --git a/binutils/binutils-2.21/binutils/dlltool.h b/binutils/dlltool.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/dlltool.h
rename to binutils/dlltool.h

diff --git a/binutils/binutils-2.21/binutils/dllwrap.c b/binutils/dllwrap.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/dllwrap.c
rename to binutils/dllwrap.c

diff --git a/binutils/binutils-2.21/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/binutils/doc/Makefile.am
rename to binutils/doc/Makefile.am

diff --git a/binutils/binutils-2.21/binutils/doc/Makefile.in b/binutils/doc/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/doc/Makefile.in
rename to binutils/doc/Makefile.in

diff --git a/binutils/binutils-2.21/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
similarity index 100%
rename from binutils/binutils-2.21/binutils/doc/binutils.texi
rename to binutils/doc/binutils.texi

diff --git a/binutils/binutils-2.21/binutils/doc/cxxfilt.man b/binutils/doc/cxxfilt.man
similarity index 100%
rename from binutils/binutils-2.21/binutils/doc/cxxfilt.man
rename to binutils/doc/cxxfilt.man

diff --git a/binutils/binutils-2.21/binutils/doc/fdl.texi b/binutils/doc/fdl.texi
similarity index 100%
rename from binutils/binutils-2.21/binutils/doc/fdl.texi
rename to binutils/doc/fdl.texi

diff --git a/binutils/binutils-2.21/binutils/dwarf.c b/binutils/dwarf.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/dwarf.c
rename to binutils/dwarf.c

diff --git a/binutils/binutils-2.21/binutils/dwarf.h b/binutils/dwarf.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/dwarf.h
rename to binutils/dwarf.h

diff --git a/binutils/binutils-2.21/binutils/elfedit.c b/binutils/elfedit.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/elfedit.c
rename to binutils/elfedit.c

diff --git a/binutils/binutils-2.21/binutils/embedspu.sh b/binutils/embedspu.sh
similarity index 100%
rename from binutils/binutils-2.21/binutils/embedspu.sh
rename to binutils/embedspu.sh

diff --git a/binutils/binutils-2.21/binutils/emul_aix.c b/binutils/emul_aix.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/emul_aix.c
rename to binutils/emul_aix.c

diff --git a/binutils/binutils-2.21/binutils/emul_vanilla.c b/binutils/emul_vanilla.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/emul_vanilla.c
rename to binutils/emul_vanilla.c

diff --git a/binutils/binutils-2.21/binutils/filemode.c b/binutils/filemode.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/filemode.c
rename to binutils/filemode.c

diff --git a/binutils/binutils-2.21/binutils/ieee.c b/binutils/ieee.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/ieee.c
rename to binutils/ieee.c

diff --git a/binutils/binutils-2.21/binutils/is-ranlib.c b/binutils/is-ranlib.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/is-ranlib.c
rename to binutils/is-ranlib.c

diff --git a/binutils/binutils-2.21/binutils/is-strip.c b/binutils/is-strip.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/is-strip.c
rename to binutils/is-strip.c

diff --git a/binutils/binutils-2.21/binutils/makefile.vms b/binutils/makefile.vms
similarity index 100%
rename from binutils/binutils-2.21/binutils/makefile.vms
rename to binutils/makefile.vms

diff --git a/binutils/binutils-2.21/binutils/maybe-ranlib.c b/binutils/maybe-ranlib.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/maybe-ranlib.c
rename to binutils/maybe-ranlib.c

diff --git a/binutils/binutils-2.21/binutils/maybe-strip.c b/binutils/maybe-strip.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/maybe-strip.c
rename to binutils/maybe-strip.c

diff --git a/binutils/binutils-2.21/binutils/mclex.c b/binutils/mclex.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/mclex.c
rename to binutils/mclex.c

diff --git a/binutils/binutils-2.21/binutils/mcparse.c b/binutils/mcparse.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/mcparse.c
rename to binutils/mcparse.c

diff --git a/binutils/binutils-2.21/binutils/mcparse.h b/binutils/mcparse.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/mcparse.h
rename to binutils/mcparse.h

diff --git a/binutils/binutils-2.21/binutils/mcparse.y b/binutils/mcparse.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/mcparse.y
rename to binutils/mcparse.y

diff --git a/binutils/binutils-2.21/binutils/nlmconv.c b/binutils/nlmconv.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/nlmconv.c
rename to binutils/nlmconv.c

diff --git a/binutils/binutils-2.21/binutils/nlmconv.h b/binutils/nlmconv.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/nlmconv.h
rename to binutils/nlmconv.h

diff --git a/binutils/binutils-2.21/binutils/nlmheader.c b/binutils/nlmheader.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/nlmheader.c
rename to binutils/nlmheader.c

diff --git a/binutils/binutils-2.21/binutils/nlmheader.h b/binutils/nlmheader.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/nlmheader.h
rename to binutils/nlmheader.h

diff --git a/binutils/binutils-2.21/binutils/nlmheader.y b/binutils/nlmheader.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/nlmheader.y
rename to binutils/nlmheader.y

diff --git a/binutils/binutils-2.21/binutils/nm.c b/binutils/nm.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/nm.c
rename to binutils/nm.c

diff --git a/binutils/binutils-2.21/binutils/not-ranlib.c b/binutils/not-ranlib.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/not-ranlib.c
rename to binutils/not-ranlib.c

diff --git a/binutils/binutils-2.21/binutils/not-strip.c b/binutils/not-strip.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/not-strip.c
rename to binutils/not-strip.c

diff --git a/binutils/binutils-2.21/binutils/objcopy.c b/binutils/objcopy.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/objcopy.c
rename to binutils/objcopy.c

diff --git a/binutils/binutils-2.21/binutils/objdump.c b/binutils/objdump.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/objdump.c
rename to binutils/objdump.c

diff --git a/binutils/binutils-2.21/binutils/po/Make-in b/binutils/po/Make-in
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/Make-in
rename to binutils/po/Make-in

diff --git a/binutils/binutils-2.21/binutils/po/POTFILES.in b/binutils/po/POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/POTFILES.in
rename to binutils/po/POTFILES.in

diff --git a/binutils/binutils-2.21/binutils/po/bg.gmo b/binutils/po/bg.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/bg.gmo
rename to binutils/po/bg.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/bg.po b/binutils/po/bg.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/bg.po
rename to binutils/po/bg.po

diff --git a/binutils/binutils-2.21/binutils/po/binutils.pot b/binutils/po/binutils.pot
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/binutils.pot
rename to binutils/po/binutils.pot

diff --git a/binutils/binutils-2.21/binutils/po/da.gmo b/binutils/po/da.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/da.gmo
rename to binutils/po/da.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/da.po b/binutils/po/da.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/da.po
rename to binutils/po/da.po

diff --git a/binutils/binutils-2.21/binutils/po/es.gmo b/binutils/po/es.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/es.gmo
rename to binutils/po/es.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/es.po b/binutils/po/es.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/es.po
rename to binutils/po/es.po

diff --git a/binutils/binutils-2.21/binutils/po/fi.gmo b/binutils/po/fi.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/fi.gmo
rename to binutils/po/fi.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/fi.po b/binutils/po/fi.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/fi.po
rename to binutils/po/fi.po

diff --git a/binutils/binutils-2.21/binutils/po/fr.gmo b/binutils/po/fr.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/fr.gmo
rename to binutils/po/fr.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/fr.po b/binutils/po/fr.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/fr.po
rename to binutils/po/fr.po

diff --git a/binutils/binutils-2.21/binutils/po/id.gmo b/binutils/po/id.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/id.gmo
rename to binutils/po/id.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/id.po b/binutils/po/id.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/id.po
rename to binutils/po/id.po

diff --git a/binutils/binutils-2.21/binutils/po/ja.gmo b/binutils/po/ja.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ja.gmo
rename to binutils/po/ja.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/ja.po b/binutils/po/ja.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ja.po
rename to binutils/po/ja.po

diff --git a/binutils/binutils-2.21/binutils/po/ro.gmo b/binutils/po/ro.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ro.gmo
rename to binutils/po/ro.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/ro.po b/binutils/po/ro.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ro.po
rename to binutils/po/ro.po

diff --git a/binutils/binutils-2.21/binutils/po/ru.gmo b/binutils/po/ru.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ru.gmo
rename to binutils/po/ru.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/ru.po b/binutils/po/ru.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ru.po
rename to binutils/po/ru.po

diff --git a/binutils/binutils-2.21/binutils/po/rw.gmo b/binutils/po/rw.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/rw.gmo
rename to binutils/po/rw.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/rw.po b/binutils/po/rw.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/rw.po
rename to binutils/po/rw.po

diff --git a/binutils/binutils-2.21/binutils/po/sk.gmo b/binutils/po/sk.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/sk.gmo
rename to binutils/po/sk.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/sk.po b/binutils/po/sk.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/sk.po
rename to binutils/po/sk.po

diff --git a/binutils/binutils-2.21/binutils/po/sv.gmo b/binutils/po/sv.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/sv.gmo
rename to binutils/po/sv.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/sv.po b/binutils/po/sv.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/sv.po
rename to binutils/po/sv.po

diff --git a/binutils/binutils-2.21/binutils/po/tr.gmo b/binutils/po/tr.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/tr.gmo
rename to binutils/po/tr.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/tr.po b/binutils/po/tr.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/tr.po
rename to binutils/po/tr.po

diff --git a/binutils/binutils-2.21/binutils/po/uk.gmo b/binutils/po/uk.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/uk.gmo
rename to binutils/po/uk.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/uk.po b/binutils/po/uk.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/uk.po
rename to binutils/po/uk.po

diff --git a/binutils/binutils-2.21/binutils/po/vi.gmo b/binutils/po/vi.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/vi.gmo
rename to binutils/po/vi.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/vi.po b/binutils/po/vi.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/vi.po
rename to binutils/po/vi.po

diff --git a/binutils/binutils-2.21/binutils/po/zh_CN.gmo b/binutils/po/zh_CN.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/zh_CN.gmo
rename to binutils/po/zh_CN.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/zh_CN.po b/binutils/po/zh_CN.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/zh_CN.po
rename to binutils/po/zh_CN.po

diff --git a/binutils/binutils-2.21/binutils/po/zh_TW.gmo b/binutils/po/zh_TW.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/zh_TW.gmo
rename to binutils/po/zh_TW.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/po/zh_TW.po b/binutils/po/zh_TW.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/zh_TW.po
rename to binutils/po/zh_TW.po

diff --git a/binutils/binutils-2.21/binutils/prdbg.c b/binutils/prdbg.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/prdbg.c
rename to binutils/prdbg.c

diff --git a/binutils/binutils-2.21/binutils/ranlib.sh b/binutils/ranlib.sh
similarity index 100%
rename from binutils/binutils-2.21/binutils/ranlib.sh
rename to binutils/ranlib.sh

diff --git a/binutils/binutils-2.21/binutils/rclex.c b/binutils/rclex.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rclex.c
rename to binutils/rclex.c

diff --git a/binutils/binutils-2.21/binutils/rcparse.c b/binutils/rcparse.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rcparse.c
rename to binutils/rcparse.c

diff --git a/binutils/binutils-2.21/binutils/rcparse.h b/binutils/rcparse.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/rcparse.h
rename to binutils/rcparse.h

diff --git a/binutils/binutils-2.21/binutils/rcparse.y b/binutils/rcparse.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/rcparse.y
rename to binutils/rcparse.y

diff --git a/binutils/binutils-2.21/binutils/rdcoff.c b/binutils/rdcoff.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rdcoff.c
rename to binutils/rdcoff.c

diff --git a/binutils/binutils-2.21/binutils/rddbg.c b/binutils/rddbg.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rddbg.c
rename to binutils/rddbg.c

diff --git a/binutils/binutils-2.21/binutils/readelf.c b/binutils/readelf.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/readelf.c
rename to binutils/readelf.c

diff --git a/binutils/binutils-2.21/binutils/rename.c b/binutils/rename.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rename.c
rename to binutils/rename.c

diff --git a/binutils/binutils-2.21/binutils/resbin.c b/binutils/resbin.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/resbin.c
rename to binutils/resbin.c

diff --git a/binutils/binutils-2.21/binutils/rescoff.c b/binutils/rescoff.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rescoff.c
rename to binutils/rescoff.c

diff --git a/binutils/binutils-2.21/binutils/resrc.c b/binutils/resrc.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/resrc.c
rename to binutils/resrc.c

diff --git a/binutils/binutils-2.21/binutils/resres.c b/binutils/resres.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/resres.c
rename to binutils/resres.c

diff --git a/binutils/binutils-2.21/binutils/sanity.sh b/binutils/sanity.sh
similarity index 100%
rename from binutils/binutils-2.21/binutils/sanity.sh
rename to binutils/sanity.sh

diff --git a/binutils/binutils-2.21/binutils/size.c b/binutils/size.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/size.c
rename to binutils/size.c

diff --git a/binutils/binutils-2.21/binutils/srconv.c b/binutils/srconv.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/srconv.c
rename to binutils/srconv.c

diff --git a/binutils/binutils-2.21/binutils/stabs.c b/binutils/stabs.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/stabs.c
rename to binutils/stabs.c

diff --git a/binutils/binutils-2.21/binutils/stamp-h.in b/binutils/stamp-h.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/stamp-h.in
rename to binutils/stamp-h.in

diff --git a/binutils/binutils-2.21/binutils/strings.c b/binutils/strings.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/strings.c
rename to binutils/strings.c

diff --git a/binutils/binutils-2.21/binutils/sysdep.h b/binutils/sysdep.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysdep.h
rename to binutils/sysdep.h

diff --git a/binutils/binutils-2.21/binutils/sysdump.c b/binutils/sysdump.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysdump.c
rename to binutils/sysdump.c

diff --git a/binutils/binutils-2.21/binutils/sysinfo.c b/binutils/sysinfo.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysinfo.c
rename to binutils/sysinfo.c

diff --git a/binutils/binutils-2.21/binutils/sysinfo.h b/binutils/sysinfo.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysinfo.h
rename to binutils/sysinfo.h

diff --git a/binutils/binutils-2.21/binutils/sysinfo.y b/binutils/sysinfo.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysinfo.y
rename to binutils/sysinfo.y

diff --git a/binutils/binutils-2.21/binutils/syslex.c b/binutils/syslex.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/syslex.c
rename to binutils/syslex.c

diff --git a/binutils/binutils-2.21/binutils/syslex.l b/binutils/syslex.l
similarity index 100%
rename from binutils/binutils-2.21/binutils/syslex.l
rename to binutils/syslex.l

diff --git a/binutils/binutils-2.21/binutils/sysroff.info b/binutils/sysroff.info
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysroff.info
rename to binutils/sysroff.info

diff --git a/binutils/binutils-2.21/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/ChangeLog
rename to binutils/testsuite/ChangeLog

diff --git a/binutils/binutils-2.21/binutils/testsuite/ChangeLog-9303 b/binutils/testsuite/ChangeLog-9303
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/ChangeLog-9303
rename to binutils/testsuite/ChangeLog-9303

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/add-empty-section.d b/binutils/testsuite/binutils-all/add-empty-section.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/add-empty-section.d
rename to binutils/testsuite/binutils-all/add-empty-section.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/add-section.d b/binutils/testsuite/binutils-all/add-section.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/add-section.d
rename to binutils/testsuite/binutils-all/add-section.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/alias-2.def b/binutils/testsuite/binutils-all/alias-2.def
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/alias-2.def
rename to binutils/testsuite/binutils-all/alias-2.def

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/alias.def b/binutils/testsuite/binutils-all/alias.def
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/alias.def
rename to binutils/testsuite/binutils-all/alias.def

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/ar.exp
rename to binutils/testsuite/binutils-all/ar.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/arm/objdump.exp b/binutils/testsuite/binutils-all/arm/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/arm/objdump.exp
rename to binutils/testsuite/binutils-all/arm/objdump.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/arm/thumb2-cond.s b/binutils/testsuite/binutils-all/arm/thumb2-cond.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/arm/thumb2-cond.s
rename to binutils/testsuite/binutils-all/arm/thumb2-cond.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/bfin/objdump.exp b/binutils/testsuite/binutils-all/bfin/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/bfin/objdump.exp
rename to binutils/testsuite/binutils-all/bfin/objdump.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/bfin/unknown-mode.s b/binutils/testsuite/binutils-all/bfin/unknown-mode.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/bfin/unknown-mode.s
rename to binutils/testsuite/binutils-all/bfin/unknown-mode.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/bintest.s b/binutils/testsuite/binutils-all/bintest.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/bintest.s
rename to binutils/testsuite/binutils-all/bintest.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/compress.exp b/binutils/testsuite/binutils-all/compress.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/compress.exp
rename to binutils/testsuite/binutils-all/compress.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-1.d b/binutils/testsuite/binutils-all/copy-1.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-1.d
rename to binutils/testsuite/binutils-all/copy-1.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-1.s b/binutils/testsuite/binutils-all/copy-1.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-1.s
rename to binutils/testsuite/binutils-all/copy-1.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-2.d b/binutils/testsuite/binutils-all/copy-2.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-2.d
rename to binutils/testsuite/binutils-all/copy-2.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-3.d b/binutils/testsuite/binutils-all/copy-3.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-3.d
rename to binutils/testsuite/binutils-all/copy-3.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-4.d b/binutils/testsuite/binutils-all/copy-4.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-4.d
rename to binutils/testsuite/binutils-all/copy-4.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copytest.s b/binutils/testsuite/binutils-all/copytest.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copytest.s
rename to binutils/testsuite/binutils-all/copytest.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/dlltool.exp b/binutils/testsuite/binutils-all/dlltool.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/dlltool.exp
rename to binutils/testsuite/binutils-all/dlltool.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/dumptest.s b/binutils/testsuite/binutils-all/dumptest.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/dumptest.s
rename to binutils/testsuite/binutils-all/dumptest.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-1.S b/binutils/testsuite/binutils-all/dw2-1.S
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-1.S
rename to binutils/testsuite/binutils-all/dw2-1.S

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-2.S b/binutils/testsuite/binutils-all/dw2-2.S
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-2.S
rename to binutils/testsuite/binutils-all/dw2-2.S

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-compressed.S b/binutils/testsuite/binutils-all/dw2-compressed.S
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-compressed.S
rename to binutils/testsuite/binutils-all/dw2-compressed.S

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-1.d b/binutils/testsuite/binutils-all/elfedit-1.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-1.d
rename to binutils/testsuite/binutils-all/elfedit-1.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-2.d b/binutils/testsuite/binutils-all/elfedit-2.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-2.d
rename to binutils/testsuite/binutils-all/elfedit-2.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-3.d b/binutils/testsuite/binutils-all/elfedit-3.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-3.d
rename to binutils/testsuite/binutils-all/elfedit-3.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit.exp b/binutils/testsuite/binutils-all/elfedit.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit.exp
rename to binutils/testsuite/binutils-all/elfedit.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/empty-file b/binutils/testsuite/binutils-all/empty-file
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/empty-file
rename to binutils/testsuite/binutils-all/empty-file

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/empty.s b/binutils/testsuite/binutils-all/empty.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/empty.s
rename to binutils/testsuite/binutils-all/empty.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1.s b/binutils/testsuite/binutils-all/exclude-1.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1.s
rename to binutils/testsuite/binutils-all/exclude-1.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1a.d b/binutils/testsuite/binutils-all/exclude-1a.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1a.d
rename to binutils/testsuite/binutils-all/exclude-1a.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1b.d b/binutils/testsuite/binutils-all/exclude-1b.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1b.d
rename to binutils/testsuite/binutils-all/exclude-1b.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/fastcall.def b/binutils/testsuite/binutils-all/fastcall.def
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/fastcall.def
rename to binutils/testsuite/binutils-all/fastcall.def

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-2.s b/binutils/testsuite/binutils-all/group-2.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-2.s
rename to binutils/testsuite/binutils-all/group-2.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-3.s b/binutils/testsuite/binutils-all/group-3.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-3.s
rename to binutils/testsuite/binutils-all/group-3.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-4.s b/binutils/testsuite/binutils-all/group-4.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-4.s
rename to binutils/testsuite/binutils-all/group-4.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-5.d b/binutils/testsuite/binutils-all/group-5.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-5.d
rename to binutils/testsuite/binutils-all/group-5.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-5.s b/binutils/testsuite/binutils-all/group-5.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-5.s
rename to binutils/testsuite/binutils-all/group-5.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-6.d b/binutils/testsuite/binutils-all/group-6.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-6.d
rename to binutils/testsuite/binutils-all/group-6.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-6.s b/binutils/testsuite/binutils-all/group-6.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-6.s
rename to binutils/testsuite/binutils-all/group-6.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group.s b/binutils/testsuite/binutils-all/group.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group.s
rename to binutils/testsuite/binutils-all/group.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/addendbug.s b/binutils/testsuite/binutils-all/hppa/addendbug.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/addendbug.s
rename to binutils/testsuite/binutils-all/hppa/addendbug.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/freg.s b/binutils/testsuite/binutils-all/hppa/freg.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/freg.s
rename to binutils/testsuite/binutils-all/hppa/freg.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/objdump.exp b/binutils/testsuite/binutils-all/hppa/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/objdump.exp
rename to binutils/testsuite/binutils-all/hppa/objdump.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1.s b/binutils/testsuite/binutils-all/i386/compressed-1.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1.s
rename to binutils/testsuite/binutils-all/i386/compressed-1.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1a.d b/binutils/testsuite/binutils-all/i386/compressed-1a.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1a.d
rename to binutils/testsuite/binutils-all/i386/compressed-1a.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1b.d b/binutils/testsuite/binutils-all/i386/compressed-1b.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1b.d
rename to binutils/testsuite/binutils-all/i386/compressed-1b.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1c.d b/binutils/testsuite/binutils-all/i386/compressed-1c.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1c.d
rename to binutils/testsuite/binutils-all/i386/compressed-1c.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/i386.exp b/binutils/testsuite/binutils-all/i386/i386.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/i386.exp
rename to binutils/testsuite/binutils-all/i386/i386.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/libdw2-compressed.out b/binutils/testsuite/binutils-all/libdw2-compressed.out
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/libdw2-compressed.out
rename to binutils/testsuite/binutils-all/libdw2-compressed.out

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/libdw2.out b/binutils/testsuite/binutils-all/libdw2.out
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/libdw2.out
rename to binutils/testsuite/binutils-all/libdw2.out

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/link-order.s b/binutils/testsuite/binutils-all/link-order.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/link-order.s
rename to binutils/testsuite/binutils-all/link-order.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-1.d b/binutils/testsuite/binutils-all/localize-hidden-1.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-1.d
rename to binutils/testsuite/binutils-all/localize-hidden-1.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-1.s b/binutils/testsuite/binutils-all/localize-hidden-1.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-1.s
rename to binutils/testsuite/binutils-all/localize-hidden-1.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-2.d b/binutils/testsuite/binutils-all/localize-hidden-2.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-2.d
rename to binutils/testsuite/binutils-all/localize-hidden-2.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-2.s b/binutils/testsuite/binutils-all/localize-hidden-2.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-2.s
rename to binutils/testsuite/binutils-all/localize-hidden-2.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/fnop.s b/binutils/testsuite/binutils-all/m68k/fnop.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/fnop.s
rename to binutils/testsuite/binutils-all/m68k/fnop.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/movem.s b/binutils/testsuite/binutils-all/m68k/movem.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/movem.s
rename to binutils/testsuite/binutils-all/m68k/movem.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/objdump.exp b/binutils/testsuite/binutils-all/m68k/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/objdump.exp
rename to binutils/testsuite/binutils-all/m68k/objdump.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/needed-by-reloc.s b/binutils/testsuite/binutils-all/needed-by-reloc.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/needed-by-reloc.s
rename to binutils/testsuite/binutils-all/needed-by-reloc.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/nm.exp b/binutils/testsuite/binutils-all/nm.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/nm.exp
rename to binutils/testsuite/binutils-all/nm.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/note-1.d b/binutils/testsuite/binutils-all/note-1.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/note-1.d
rename to binutils/testsuite/binutils-all/note-1.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/objcopy.exp
rename to binutils/testsuite/binutils-all/objcopy.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.W b/binutils/testsuite/binutils-all/objdump.W
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.W
rename to binutils/testsuite/binutils-all/objdump.W

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.exp
rename to binutils/testsuite/binutils-all/objdump.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.s b/binutils/testsuite/binutils-all/objdump.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.s
rename to binutils/testsuite/binutils-all/objdump.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.exp b/binutils/testsuite/binutils-all/readelf.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.exp
rename to binutils/testsuite/binutils-all/readelf.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.h b/binutils/testsuite/binutils-all/readelf.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.h
rename to binutils/testsuite/binutils-all/readelf.h

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.r b/binutils/testsuite/binutils-all/readelf.r
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.r
rename to binutils/testsuite/binutils-all/readelf.r

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.r-64 b/binutils/testsuite/binutils-all/readelf.r-64
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.r-64
rename to binutils/testsuite/binutils-all/readelf.r-64

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.s b/binutils/testsuite/binutils-all/readelf.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.s
rename to binutils/testsuite/binutils-all/readelf.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.s-64 b/binutils/testsuite/binutils-all/readelf.s-64
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.s-64
rename to binutils/testsuite/binutils-all/readelf.s-64

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss b/binutils/testsuite/binutils-all/readelf.ss
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss
rename to binutils/testsuite/binutils-all/readelf.ss

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-64 b/binutils/testsuite/binutils-all/readelf.ss-64
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-64
rename to binutils/testsuite/binutils-all/readelf.ss-64

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-mips b/binutils/testsuite/binutils-all/readelf.ss-mips
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-mips
rename to binutils/testsuite/binutils-all/readelf.ss-mips

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-tmips b/binutils/testsuite/binutils-all/readelf.ss-tmips
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-tmips
rename to binutils/testsuite/binutils-all/readelf.ss-tmips

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.wa b/binutils/testsuite/binutils-all/readelf.wa
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.wa
rename to binutils/testsuite/binutils-all/readelf.wa

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/size.exp b/binutils/testsuite/binutils-all/size.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/size.exp
rename to binutils/testsuite/binutils-all/size.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-1.d b/binutils/testsuite/binutils-all/strip-1.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-1.d
rename to binutils/testsuite/binutils-all/strip-1.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-10.d b/binutils/testsuite/binutils-all/strip-10.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-10.d
rename to binutils/testsuite/binutils-all/strip-10.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-2.d b/binutils/testsuite/binutils-all/strip-2.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-2.d
rename to binutils/testsuite/binutils-all/strip-2.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-3.d b/binutils/testsuite/binutils-all/strip-3.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-3.d
rename to binutils/testsuite/binutils-all/strip-3.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-4.d b/binutils/testsuite/binutils-all/strip-4.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-4.d
rename to binutils/testsuite/binutils-all/strip-4.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-5.d b/binutils/testsuite/binutils-all/strip-5.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-5.d
rename to binutils/testsuite/binutils-all/strip-5.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-6.d b/binutils/testsuite/binutils-all/strip-6.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-6.d
rename to binutils/testsuite/binutils-all/strip-6.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-7.d b/binutils/testsuite/binutils-all/strip-7.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-7.d
rename to binutils/testsuite/binutils-all/strip-7.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-8.d b/binutils/testsuite/binutils-all/strip-8.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-8.d
rename to binutils/testsuite/binutils-all/strip-8.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-9.d b/binutils/testsuite/binutils-all/strip-9.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-9.d
rename to binutils/testsuite/binutils-all/strip-9.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/testprog.c b/binutils/testsuite/binutils-all/testprog.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/testprog.c
rename to binutils/testsuite/binutils-all/testprog.c

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges-ia64.d b/binutils/testsuite/binutils-all/testranges-ia64.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges-ia64.d
rename to binutils/testsuite/binutils-all/testranges-ia64.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges-ia64.s b/binutils/testsuite/binutils-all/testranges-ia64.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges-ia64.s
rename to binutils/testsuite/binutils-all/testranges-ia64.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges.d b/binutils/testsuite/binutils-all/testranges.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges.d
rename to binutils/testsuite/binutils-all/testranges.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges.s b/binutils/testsuite/binutils-all/testranges.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges.s
rename to binutils/testsuite/binutils-all/testranges.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/unique.s b/binutils/testsuite/binutils-all/unique.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/unique.s
rename to binutils/testsuite/binutils-all/unique.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/unknown.s b/binutils/testsuite/binutils-all/unknown.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/unknown.s
rename to binutils/testsuite/binutils-all/unknown.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/vax/entrymask.s b/binutils/testsuite/binutils-all/vax/entrymask.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/vax/entrymask.s
rename to binutils/testsuite/binutils-all/vax/entrymask.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/vax/objdump.exp b/binutils/testsuite/binutils-all/vax/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/vax/objdump.exp
rename to binutils/testsuite/binutils-all/vax/objdump.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/MSG00001.bin b/binutils/testsuite/binutils-all/windres/MSG00001.bin
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/MSG00001.bin
rename to binutils/testsuite/binutils-all/windres/MSG00001.bin
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/README b/binutils/testsuite/binutils-all/windres/README
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/README
rename to binutils/testsuite/binutils-all/windres/README

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmp1.bmp b/binutils/testsuite/binutils-all/windres/bmp1.bmp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmp1.bmp
rename to binutils/testsuite/binutils-all/windres/bmp1.bmp
Binary files differ

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmpalign.rc b/binutils/testsuite/binutils-all/windres/bmpalign.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmpalign.rc
rename to binutils/testsuite/binutils-all/windres/bmpalign.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmpalign.rsd b/binutils/testsuite/binutils-all/windres/bmpalign.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmpalign.rsd
rename to binutils/testsuite/binutils-all/windres/bmpalign.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/capstyle.rc b/binutils/testsuite/binutils-all/windres/capstyle.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/capstyle.rc
rename to binutils/testsuite/binutils-all/windres/capstyle.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/capstyle.rsd b/binutils/testsuite/binutils-all/windres/capstyle.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/capstyle.rsd
rename to binutils/testsuite/binutils-all/windres/capstyle.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/checkbox.rc b/binutils/testsuite/binutils-all/windres/checkbox.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/checkbox.rc
rename to binutils/testsuite/binutils-all/windres/checkbox.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/checkbox.rsd b/binutils/testsuite/binutils-all/windres/checkbox.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/checkbox.rsd
rename to binutils/testsuite/binutils-all/windres/checkbox.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/combobox.rc b/binutils/testsuite/binutils-all/windres/combobox.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/combobox.rc
rename to binutils/testsuite/binutils-all/windres/combobox.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/combobox.rsd b/binutils/testsuite/binutils-all/windres/combobox.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/combobox.rsd
rename to binutils/testsuite/binutils-all/windres/combobox.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/deflang.rc b/binutils/testsuite/binutils-all/windres/deflang.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/deflang.rc
rename to binutils/testsuite/binutils-all/windres/deflang.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/deflang.rsd b/binutils/testsuite/binutils-all/windres/deflang.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/deflang.rsd
rename to binutils/testsuite/binutils-all/windres/deflang.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog0.rc b/binutils/testsuite/binutils-all/windres/dialog0.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog0.rc
rename to binutils/testsuite/binutils-all/windres/dialog0.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog0.rsd b/binutils/testsuite/binutils-all/windres/dialog0.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog0.rsd
rename to binutils/testsuite/binutils-all/windres/dialog0.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog1.rc b/binutils/testsuite/binutils-all/windres/dialog1.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog1.rc
rename to binutils/testsuite/binutils-all/windres/dialog1.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog1.rsd b/binutils/testsuite/binutils-all/windres/dialog1.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog1.rsd
rename to binutils/testsuite/binutils-all/windres/dialog1.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogid.rc b/binutils/testsuite/binutils-all/windres/dialogid.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogid.rc
rename to binutils/testsuite/binutils-all/windres/dialogid.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogid.rsd b/binutils/testsuite/binutils-all/windres/dialogid.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogid.rsd
rename to binutils/testsuite/binutils-all/windres/dialogid.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogsignature.rc b/binutils/testsuite/binutils-all/windres/dialogsignature.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogsignature.rc
rename to binutils/testsuite/binutils-all/windres/dialogsignature.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogsignature.rsd b/binutils/testsuite/binutils-all/windres/dialogsignature.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogsignature.rsd
rename to binutils/testsuite/binutils-all/windres/dialogsignature.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dlgfont.rc b/binutils/testsuite/binutils-all/windres/dlgfont.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dlgfont.rc
rename to binutils/testsuite/binutils-all/windres/dlgfont.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dlgfont.rsd b/binutils/testsuite/binutils-all/windres/dlgfont.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dlgfont.rsd
rename to binutils/testsuite/binutils-all/windres/dlgfont.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/edittext.rc b/binutils/testsuite/binutils-all/windres/edittext.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/edittext.rc
rename to binutils/testsuite/binutils-all/windres/edittext.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/edittext.rsd b/binutils/testsuite/binutils-all/windres/edittext.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/edittext.rsd
rename to binutils/testsuite/binutils-all/windres/edittext.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapea.rc b/binutils/testsuite/binutils-all/windres/escapea.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapea.rc
rename to binutils/testsuite/binutils-all/windres/escapea.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapea.rsd b/binutils/testsuite/binutils-all/windres/escapea.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapea.rsd
rename to binutils/testsuite/binutils-all/windres/escapea.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex-2.rc b/binutils/testsuite/binutils-all/windres/escapex-2.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex-2.rc
rename to binutils/testsuite/binutils-all/windres/escapex-2.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex-2.rsd b/binutils/testsuite/binutils-all/windres/escapex-2.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex-2.rsd
rename to binutils/testsuite/binutils-all/windres/escapex-2.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex.rc b/binutils/testsuite/binutils-all/windres/escapex.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex.rc
rename to binutils/testsuite/binutils-all/windres/escapex.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex.rsd b/binutils/testsuite/binutils-all/windres/escapex.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex.rsd
rename to binutils/testsuite/binutils-all/windres/escapex.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html.rc b/binutils/testsuite/binutils-all/windres/html.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html.rc
rename to binutils/testsuite/binutils-all/windres/html.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html.rsd b/binutils/testsuite/binutils-all/windres/html.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html.rsd
rename to binutils/testsuite/binutils-all/windres/html.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html1.hm b/binutils/testsuite/binutils-all/windres/html1.hm
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html1.hm
rename to binutils/testsuite/binutils-all/windres/html1.hm

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html2.hm b/binutils/testsuite/binutils-all/windres/html2.hm
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html2.hm
rename to binutils/testsuite/binutils-all/windres/html2.hm

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/lang.rc b/binutils/testsuite/binutils-all/windres/lang.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/lang.rc
rename to binutils/testsuite/binutils-all/windres/lang.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/lang.rsd b/binutils/testsuite/binutils-all/windres/lang.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/lang.rsd
rename to binutils/testsuite/binutils-all/windres/lang.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/listbox.rc b/binutils/testsuite/binutils-all/windres/listbox.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/listbox.rc
rename to binutils/testsuite/binutils-all/windres/listbox.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/listbox.rsd b/binutils/testsuite/binutils-all/windres/listbox.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/listbox.rsd
rename to binutils/testsuite/binutils-all/windres/listbox.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/messagetable.rc b/binutils/testsuite/binutils-all/windres/messagetable.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/messagetable.rc
rename to binutils/testsuite/binutils-all/windres/messagetable.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/messagetable.rsd b/binutils/testsuite/binutils-all/windres/messagetable.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/messagetable.rsd
rename to binutils/testsuite/binutils-all/windres/messagetable.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/msupdate b/binutils/testsuite/binutils-all/windres/msupdate
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/msupdate
rename to binutils/testsuite/binutils-all/windres/msupdate

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/nocaption.rc b/binutils/testsuite/binutils-all/windres/nocaption.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/nocaption.rc
rename to binutils/testsuite/binutils-all/windres/nocaption.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/nocaption.rsd b/binutils/testsuite/binutils-all/windres/nocaption.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/nocaption.rsd
rename to binutils/testsuite/binutils-all/windres/nocaption.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/printstyle.rc b/binutils/testsuite/binutils-all/windres/printstyle.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/printstyle.rc
rename to binutils/testsuite/binutils-all/windres/printstyle.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/printstyle.rsd b/binutils/testsuite/binutils-all/windres/printstyle.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/printstyle.rsd
rename to binutils/testsuite/binutils-all/windres/printstyle.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/quoteclass.rc b/binutils/testsuite/binutils-all/windres/quoteclass.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/quoteclass.rc
rename to binutils/testsuite/binutils-all/windres/quoteclass.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/scrollbar.rc b/binutils/testsuite/binutils-all/windres/scrollbar.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/scrollbar.rc
rename to binutils/testsuite/binutils-all/windres/scrollbar.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/scrollbar.rsd b/binutils/testsuite/binutils-all/windres/scrollbar.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/scrollbar.rsd
rename to binutils/testsuite/binutils-all/windres/scrollbar.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab1.rc b/binutils/testsuite/binutils-all/windres/strtab1.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab1.rc
rename to binutils/testsuite/binutils-all/windres/strtab1.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab1.rsd b/binutils/testsuite/binutils-all/windres/strtab1.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab1.rsd
rename to binutils/testsuite/binutils-all/windres/strtab1.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab2.rc b/binutils/testsuite/binutils-all/windres/strtab2.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab2.rc
rename to binutils/testsuite/binutils-all/windres/strtab2.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab2.rsd b/binutils/testsuite/binutils-all/windres/strtab2.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab2.rsd
rename to binutils/testsuite/binutils-all/windres/strtab2.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/sublang.rc b/binutils/testsuite/binutils-all/windres/sublang.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/sublang.rc
rename to binutils/testsuite/binutils-all/windres/sublang.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/sublang.rsd b/binutils/testsuite/binutils-all/windres/sublang.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/sublang.rsd
rename to binutils/testsuite/binutils-all/windres/sublang.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version.rc b/binutils/testsuite/binutils-all/windres/version.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version.rc
rename to binutils/testsuite/binutils-all/windres/version.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version.rsd b/binutils/testsuite/binutils-all/windres/version.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version.rsd
rename to binutils/testsuite/binutils-all/windres/version.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version_cat.rc b/binutils/testsuite/binutils-all/windres/version_cat.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version_cat.rc
rename to binutils/testsuite/binutils-all/windres/version_cat.rc

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version_cat.rsd b/binutils/testsuite/binutils-all/windres/version_cat.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version_cat.rsd
rename to binutils/testsuite/binutils-all/windres/version_cat.rsd

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/windres.exp b/binutils/testsuite/binutils-all/windres/windres.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/windres.exp
rename to binutils/testsuite/binutils-all/windres/windres.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1.s b/binutils/testsuite/binutils-all/x86-64/compressed-1.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1.s
rename to binutils/testsuite/binutils-all/x86-64/compressed-1.s

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
rename to binutils/testsuite/binutils-all/x86-64/compressed-1a.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1b.d b/binutils/testsuite/binutils-all/x86-64/compressed-1b.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1b.d
rename to binutils/testsuite/binutils-all/x86-64/compressed-1b.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1c.d b/binutils/testsuite/binutils-all/x86-64/compressed-1c.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1c.d
rename to binutils/testsuite/binutils-all/x86-64/compressed-1c.d

diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/x86-64.exp b/binutils/testsuite/binutils-all/x86-64/x86-64.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/x86-64.exp
rename to binutils/testsuite/binutils-all/x86-64/x86-64.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/config/default.exp b/binutils/testsuite/config/default.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/config/default.exp
rename to binutils/testsuite/config/default.exp

diff --git a/binutils/binutils-2.21/binutils/testsuite/config/hppa.sed b/binutils/testsuite/config/hppa.sed
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/config/hppa.sed
rename to binutils/testsuite/config/hppa.sed

diff --git a/binutils/binutils-2.21/binutils/testsuite/lib/utils-lib.exp b/binutils/testsuite/lib/utils-lib.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/lib/utils-lib.exp
rename to binutils/testsuite/lib/utils-lib.exp

diff --git a/binutils/binutils-2.21/binutils/unwind-ia64.c b/binutils/unwind-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/unwind-ia64.c
rename to binutils/unwind-ia64.c

diff --git a/binutils/binutils-2.21/binutils/unwind-ia64.h b/binutils/unwind-ia64.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/unwind-ia64.h
rename to binutils/unwind-ia64.h

diff --git a/binutils/binutils-2.21/binutils/version.c b/binutils/version.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/version.c
rename to binutils/version.c

diff --git a/binutils/binutils-2.21/binutils/windint.h b/binutils/windint.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/windint.h
rename to binutils/windint.h

diff --git a/binutils/binutils-2.21/binutils/windmc.c b/binutils/windmc.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/windmc.c
rename to binutils/windmc.c

diff --git a/binutils/binutils-2.21/binutils/windmc.h b/binutils/windmc.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/windmc.h
rename to binutils/windmc.h

diff --git a/binutils/binutils-2.21/binutils/windres.c b/binutils/windres.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/windres.c
rename to binutils/windres.c

diff --git a/binutils/binutils-2.21/binutils/windres.h b/binutils/windres.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/windres.h
rename to binutils/windres.h

diff --git a/binutils/binutils-2.21/binutils/winduni.c b/binutils/winduni.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/winduni.c
rename to binutils/winduni.c

diff --git a/binutils/binutils-2.21/binutils/winduni.h b/binutils/winduni.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/winduni.h
rename to binutils/winduni.h

diff --git a/binutils/binutils-2.21/binutils/wrstabs.c b/binutils/wrstabs.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/wrstabs.c
rename to binutils/wrstabs.c

diff --git a/binutils/binutils-2.21/compile b/compile
similarity index 100%
rename from binutils/binutils-2.21/compile
rename to compile

diff --git a/binutils/binutils-2.21/config-ml.in b/config-ml.in
similarity index 100%
rename from binutils/binutils-2.21/config-ml.in
rename to config-ml.in

diff --git a/binutils/binutils-2.21/config.guess b/config.guess
similarity index 100%
rename from binutils/binutils-2.21/config.guess
rename to config.guess

diff --git a/binutils/binutils-2.21/config.rpath b/config.rpath
similarity index 100%
rename from binutils/binutils-2.21/config.rpath
rename to config.rpath

diff --git a/binutils/binutils-2.21/config.sub b/config.sub
similarity index 100%
rename from binutils/binutils-2.21/config.sub
rename to config.sub

diff --git a/binutils/binutils-2.21/config/ChangeLog b/config/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/config/ChangeLog
rename to config/ChangeLog

diff --git a/binutils/binutils-2.21/config/acinclude.m4 b/config/acinclude.m4
similarity index 100%
rename from binutils/binutils-2.21/config/acinclude.m4
rename to config/acinclude.m4

diff --git a/binutils/binutils-2.21/config/acx.m4 b/config/acx.m4
similarity index 100%
rename from binutils/binutils-2.21/config/acx.m4
rename to config/acx.m4

diff --git a/binutils/binutils-2.21/config/bootstrap-O1.mk b/config/bootstrap-O1.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-O1.mk
rename to config/bootstrap-O1.mk

diff --git a/binutils/binutils-2.21/config/bootstrap-O3.mk b/config/bootstrap-O3.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-O3.mk
rename to config/bootstrap-O3.mk

diff --git a/binutils/binutils-2.21/config/bootstrap-debug-big.mk b/config/bootstrap-debug-big.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-debug-big.mk
rename to config/bootstrap-debug-big.mk

diff --git a/binutils/binutils-2.21/config/bootstrap-debug-ckovw.mk b/config/bootstrap-debug-ckovw.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-debug-ckovw.mk
rename to config/bootstrap-debug-ckovw.mk

diff --git a/binutils/binutils-2.21/config/bootstrap-debug-lean.mk b/config/bootstrap-debug-lean.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-debug-lean.mk
rename to config/bootstrap-debug-lean.mk

diff --git a/binutils/binutils-2.21/config/bootstrap-debug-lib.mk b/config/bootstrap-debug-lib.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-debug-lib.mk
rename to config/bootstrap-debug-lib.mk

diff --git a/binutils/binutils-2.21/config/bootstrap-debug.mk b/config/bootstrap-debug.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-debug.mk
rename to config/bootstrap-debug.mk

diff --git a/binutils/binutils-2.21/config/bootstrap-lto.mk b/config/bootstrap-lto.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-lto.mk
rename to config/bootstrap-lto.mk

diff --git a/binutils/binutils-2.21/config/bootstrap-time.mk b/config/bootstrap-time.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-time.mk
rename to config/bootstrap-time.mk

diff --git a/binutils/binutils-2.21/config/codeset.m4 b/config/codeset.m4
similarity index 100%
rename from binutils/binutils-2.21/config/codeset.m4
rename to config/codeset.m4

diff --git a/binutils/binutils-2.21/config/depstand.m4 b/config/depstand.m4
similarity index 100%
rename from binutils/binutils-2.21/config/depstand.m4
rename to config/depstand.m4

diff --git a/binutils/binutils-2.21/config/dfp.m4 b/config/dfp.m4
similarity index 100%
rename from binutils/binutils-2.21/config/dfp.m4
rename to config/dfp.m4

diff --git a/binutils/binutils-2.21/config/elf.m4 b/config/elf.m4
similarity index 100%
rename from binutils/binutils-2.21/config/elf.m4
rename to config/elf.m4

diff --git a/binutils/binutils-2.21/config/enable.m4 b/config/enable.m4
similarity index 100%
rename from binutils/binutils-2.21/config/enable.m4
rename to config/enable.m4

diff --git a/binutils/binutils-2.21/config/extensions.m4 b/config/extensions.m4
similarity index 100%
rename from binutils/binutils-2.21/config/extensions.m4
rename to config/extensions.m4

diff --git a/binutils/binutils-2.21/config/futex.m4 b/config/futex.m4
similarity index 100%
rename from binutils/binutils-2.21/config/futex.m4
rename to config/futex.m4

diff --git a/binutils/binutils-2.21/config/gc++filt.m4 b/config/gc++filt.m4
similarity index 100%
rename from binutils/binutils-2.21/config/gc++filt.m4
rename to config/gc++filt.m4

diff --git a/binutils/binutils-2.21/config/gettext-sister.m4 b/config/gettext-sister.m4
similarity index 100%
rename from binutils/binutils-2.21/config/gettext-sister.m4
rename to config/gettext-sister.m4

diff --git a/binutils/binutils-2.21/config/gettext.m4 b/config/gettext.m4
similarity index 100%
rename from binutils/binutils-2.21/config/gettext.m4
rename to config/gettext.m4

diff --git a/binutils/binutils-2.21/config/glibc21.m4 b/config/glibc21.m4
similarity index 100%
rename from binutils/binutils-2.21/config/glibc21.m4
rename to config/glibc21.m4

diff --git a/binutils/binutils-2.21/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4
similarity index 100%
rename from binutils/binutils-2.21/config/gxx-include-dir.m4
rename to config/gxx-include-dir.m4

diff --git a/binutils/binutils-2.21/config/iconv.m4 b/config/iconv.m4
similarity index 100%
rename from binutils/binutils-2.21/config/iconv.m4
rename to config/iconv.m4

diff --git a/binutils/binutils-2.21/config/intdiv0.m4 b/config/intdiv0.m4
similarity index 100%
rename from binutils/binutils-2.21/config/intdiv0.m4
rename to config/intdiv0.m4

diff --git a/binutils/binutils-2.21/config/inttypes-pri.m4 b/config/inttypes-pri.m4
similarity index 100%
rename from binutils/binutils-2.21/config/inttypes-pri.m4
rename to config/inttypes-pri.m4

diff --git a/binutils/binutils-2.21/config/inttypes.m4 b/config/inttypes.m4
similarity index 100%
rename from binutils/binutils-2.21/config/inttypes.m4
rename to config/inttypes.m4

diff --git a/binutils/binutils-2.21/config/inttypes_h.m4 b/config/inttypes_h.m4
similarity index 100%
rename from binutils/binutils-2.21/config/inttypes_h.m4
rename to config/inttypes_h.m4

diff --git a/binutils/binutils-2.21/config/largefile.m4 b/config/largefile.m4
similarity index 100%
rename from binutils/binutils-2.21/config/largefile.m4
rename to config/largefile.m4

diff --git a/binutils/binutils-2.21/config/lcmessage.m4 b/config/lcmessage.m4
similarity index 100%
rename from binutils/binutils-2.21/config/lcmessage.m4
rename to config/lcmessage.m4

diff --git a/binutils/binutils-2.21/config/ld-symbolic.m4 b/config/ld-symbolic.m4
similarity index 100%
rename from binutils/binutils-2.21/config/ld-symbolic.m4
rename to config/ld-symbolic.m4

diff --git a/binutils/binutils-2.21/config/lead-dot.m4 b/config/lead-dot.m4
similarity index 100%
rename from binutils/binutils-2.21/config/lead-dot.m4
rename to config/lead-dot.m4

diff --git a/binutils/binutils-2.21/config/lib-ld.m4 b/config/lib-ld.m4
similarity index 100%
rename from binutils/binutils-2.21/config/lib-ld.m4
rename to config/lib-ld.m4

diff --git a/binutils/binutils-2.21/config/lib-link.m4 b/config/lib-link.m4
similarity index 100%
rename from binutils/binutils-2.21/config/lib-link.m4
rename to config/lib-link.m4

diff --git a/binutils/binutils-2.21/config/lib-prefix.m4 b/config/lib-prefix.m4
similarity index 100%
rename from binutils/binutils-2.21/config/lib-prefix.m4
rename to config/lib-prefix.m4

diff --git a/binutils/binutils-2.21/config/mh-cxux b/config/mh-cxux
similarity index 100%
rename from binutils/binutils-2.21/config/mh-cxux
rename to config/mh-cxux

diff --git a/binutils/binutils-2.21/config/mh-cygwin b/config/mh-cygwin
similarity index 100%
rename from binutils/binutils-2.21/config/mh-cygwin
rename to config/mh-cygwin

diff --git a/binutils/binutils-2.21/config/mh-decstation b/config/mh-decstation
similarity index 100%
rename from binutils/binutils-2.21/config/mh-decstation
rename to config/mh-decstation

diff --git a/binutils/binutils-2.21/config/mh-dgux386 b/config/mh-dgux386
similarity index 100%
rename from binutils/binutils-2.21/config/mh-dgux386
rename to config/mh-dgux386

diff --git a/binutils/binutils-2.21/config/mh-djgpp b/config/mh-djgpp
similarity index 100%
rename from binutils/binutils-2.21/config/mh-djgpp
rename to config/mh-djgpp

diff --git a/binutils/binutils-2.21/config/mh-interix b/config/mh-interix
similarity index 100%
rename from binutils/binutils-2.21/config/mh-interix
rename to config/mh-interix

diff --git a/binutils/binutils-2.21/config/mh-lynxrs6k b/config/mh-lynxrs6k
similarity index 100%
rename from binutils/binutils-2.21/config/mh-lynxrs6k
rename to config/mh-lynxrs6k

diff --git a/binutils/binutils-2.21/config/mh-mingw b/config/mh-mingw
similarity index 100%
rename from binutils/binutils-2.21/config/mh-mingw
rename to config/mh-mingw

diff --git a/binutils/binutils-2.21/config/mh-ncr3000 b/config/mh-ncr3000
similarity index 100%
rename from binutils/binutils-2.21/config/mh-ncr3000
rename to config/mh-ncr3000

diff --git a/binutils/binutils-2.21/config/mh-necv4 b/config/mh-necv4
similarity index 100%
rename from binutils/binutils-2.21/config/mh-necv4
rename to config/mh-necv4

diff --git a/binutils/binutils-2.21/config/mh-pa b/config/mh-pa
similarity index 100%
rename from binutils/binutils-2.21/config/mh-pa
rename to config/mh-pa

diff --git a/binutils/binutils-2.21/config/mh-pa-hpux10 b/config/mh-pa-hpux10
similarity index 100%
rename from binutils/binutils-2.21/config/mh-pa-hpux10
rename to config/mh-pa-hpux10

diff --git a/binutils/binutils-2.21/config/mh-ppc-aix b/config/mh-ppc-aix
similarity index 100%
rename from binutils/binutils-2.21/config/mh-ppc-aix
rename to config/mh-ppc-aix

diff --git a/binutils/binutils-2.21/config/mh-ppc-darwin b/config/mh-ppc-darwin
similarity index 100%
rename from binutils/binutils-2.21/config/mh-ppc-darwin
rename to config/mh-ppc-darwin

diff --git a/binutils/binutils-2.21/config/mh-sco b/config/mh-sco
similarity index 100%
rename from binutils/binutils-2.21/config/mh-sco
rename to config/mh-sco

diff --git a/binutils/binutils-2.21/config/mh-solaris b/config/mh-solaris
similarity index 100%
rename from binutils/binutils-2.21/config/mh-solaris
rename to config/mh-solaris

diff --git a/binutils/binutils-2.21/config/mh-sysv4 b/config/mh-sysv4
similarity index 100%
rename from binutils/binutils-2.21/config/mh-sysv4
rename to config/mh-sysv4

diff --git a/binutils/binutils-2.21/config/mh-sysv5 b/config/mh-sysv5
similarity index 100%
rename from binutils/binutils-2.21/config/mh-sysv5
rename to config/mh-sysv5

diff --git a/binutils/binutils-2.21/config/mh-x86omitfp b/config/mh-x86omitfp
similarity index 100%
rename from binutils/binutils-2.21/config/mh-x86omitfp
rename to config/mh-x86omitfp

diff --git a/binutils/binutils-2.21/config/mt-alphaieee b/config/mt-alphaieee
similarity index 100%
rename from binutils/binutils-2.21/config/mt-alphaieee
rename to config/mt-alphaieee

diff --git a/binutils/binutils-2.21/config/mt-d30v b/config/mt-d30v
similarity index 100%
rename from binutils/binutils-2.21/config/mt-d30v
rename to config/mt-d30v

diff --git a/binutils/binutils-2.21/config/mt-gnu b/config/mt-gnu
similarity index 100%
rename from binutils/binutils-2.21/config/mt-gnu
rename to config/mt-gnu

diff --git a/binutils/binutils-2.21/config/mt-mep b/config/mt-mep
similarity index 100%
rename from binutils/binutils-2.21/config/mt-mep
rename to config/mt-mep

diff --git a/binutils/binutils-2.21/config/mt-mips-elfoabi b/config/mt-mips-elfoabi
similarity index 100%
rename from binutils/binutils-2.21/config/mt-mips-elfoabi
rename to config/mt-mips-elfoabi

diff --git a/binutils/binutils-2.21/config/mt-mips-gnu b/config/mt-mips-gnu
similarity index 100%
rename from binutils/binutils-2.21/config/mt-mips-gnu
rename to config/mt-mips-gnu

diff --git a/binutils/binutils-2.21/config/mt-mips16-compat b/config/mt-mips16-compat
similarity index 100%
rename from binutils/binutils-2.21/config/mt-mips16-compat
rename to config/mt-mips16-compat

diff --git a/binutils/binutils-2.21/config/mt-netware b/config/mt-netware
similarity index 100%
rename from binutils/binutils-2.21/config/mt-netware
rename to config/mt-netware

diff --git a/binutils/binutils-2.21/config/mt-ospace b/config/mt-ospace
similarity index 100%
rename from binutils/binutils-2.21/config/mt-ospace
rename to config/mt-ospace

diff --git a/binutils/binutils-2.21/config/mt-sde b/config/mt-sde
similarity index 100%
rename from binutils/binutils-2.21/config/mt-sde
rename to config/mt-sde

diff --git a/binutils/binutils-2.21/config/mt-spu b/config/mt-spu
similarity index 100%
rename from binutils/binutils-2.21/config/mt-spu
rename to config/mt-spu

diff --git a/binutils/binutils-2.21/config/mt-v810 b/config/mt-v810
similarity index 100%
rename from binutils/binutils-2.21/config/mt-v810
rename to config/mt-v810

diff --git a/binutils/binutils-2.21/config/mt-wince b/config/mt-wince
similarity index 100%
rename from binutils/binutils-2.21/config/mt-wince
rename to config/mt-wince

diff --git a/binutils/binutils-2.21/config/multi.m4 b/config/multi.m4
similarity index 100%
rename from binutils/binutils-2.21/config/multi.m4
rename to config/multi.m4

diff --git a/binutils/binutils-2.21/config/nls.m4 b/config/nls.m4
similarity index 100%
rename from binutils/binutils-2.21/config/nls.m4
rename to config/nls.m4

diff --git a/binutils/binutils-2.21/config/no-executables.m4 b/config/no-executables.m4
similarity index 100%
rename from binutils/binutils-2.21/config/no-executables.m4
rename to config/no-executables.m4

diff --git a/binutils/binutils-2.21/config/override.m4 b/config/override.m4
similarity index 100%
rename from binutils/binutils-2.21/config/override.m4
rename to config/override.m4

diff --git a/binutils/binutils-2.21/config/plugins.m4 b/config/plugins.m4
similarity index 100%
rename from binutils/binutils-2.21/config/plugins.m4
rename to config/plugins.m4

diff --git a/binutils/binutils-2.21/config/po.m4 b/config/po.m4
similarity index 100%
rename from binutils/binutils-2.21/config/po.m4
rename to config/po.m4

diff --git a/binutils/binutils-2.21/config/proginstall.m4 b/config/proginstall.m4
similarity index 100%
rename from binutils/binutils-2.21/config/proginstall.m4
rename to config/proginstall.m4

diff --git a/binutils/binutils-2.21/config/progtest.m4 b/config/progtest.m4
similarity index 100%
rename from binutils/binutils-2.21/config/progtest.m4
rename to config/progtest.m4

diff --git a/binutils/binutils-2.21/config/stdint.m4 b/config/stdint.m4
similarity index 100%
rename from binutils/binutils-2.21/config/stdint.m4
rename to config/stdint.m4

diff --git a/binutils/binutils-2.21/config/stdint_h.m4 b/config/stdint_h.m4
similarity index 100%
rename from binutils/binutils-2.21/config/stdint_h.m4
rename to config/stdint_h.m4

diff --git a/binutils/binutils-2.21/config/tcl.m4 b/config/tcl.m4
similarity index 100%
rename from binutils/binutils-2.21/config/tcl.m4
rename to config/tcl.m4

diff --git a/binutils/binutils-2.21/config/tls.m4 b/config/tls.m4
similarity index 100%
rename from binutils/binutils-2.21/config/tls.m4
rename to config/tls.m4

diff --git a/binutils/binutils-2.21/config/uintmax_t.m4 b/config/uintmax_t.m4
similarity index 100%
rename from binutils/binutils-2.21/config/uintmax_t.m4
rename to config/uintmax_t.m4

diff --git a/binutils/binutils-2.21/config/ulonglong.m4 b/config/ulonglong.m4
similarity index 100%
rename from binutils/binutils-2.21/config/ulonglong.m4
rename to config/ulonglong.m4

diff --git a/binutils/binutils-2.21/config/unwind_ipinfo.m4 b/config/unwind_ipinfo.m4
similarity index 100%
rename from binutils/binutils-2.21/config/unwind_ipinfo.m4
rename to config/unwind_ipinfo.m4

diff --git a/binutils/binutils-2.21/config/warnings.m4 b/config/warnings.m4
similarity index 100%
rename from binutils/binutils-2.21/config/warnings.m4
rename to config/warnings.m4

diff --git a/binutils/binutils-2.21/config/zlib.m4 b/config/zlib.m4
similarity index 100%
rename from binutils/binutils-2.21/config/zlib.m4
rename to config/zlib.m4

diff --git a/binutils/binutils-2.21/configure b/configure
similarity index 100%
rename from binutils/binutils-2.21/configure
rename to configure

diff --git a/binutils/binutils-2.21/configure.ac b/configure.ac
similarity index 100%
rename from binutils/binutils-2.21/configure.ac
rename to configure.ac

diff --git a/binutils/binutils-2.21/cpu/ChangeLog b/cpu/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/cpu/ChangeLog
rename to cpu/ChangeLog

diff --git a/binutils/binutils-2.21/cpu/cris.cpu b/cpu/cris.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/cris.cpu
rename to cpu/cris.cpu

diff --git a/binutils/binutils-2.21/cpu/frv.cpu b/cpu/frv.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/frv.cpu
rename to cpu/frv.cpu

diff --git a/binutils/binutils-2.21/cpu/frv.opc b/cpu/frv.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/frv.opc
rename to cpu/frv.opc

diff --git a/binutils/binutils-2.21/cpu/iq10.cpu b/cpu/iq10.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/iq10.cpu
rename to cpu/iq10.cpu

diff --git a/binutils/binutils-2.21/cpu/iq2000.cpu b/cpu/iq2000.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/iq2000.cpu
rename to cpu/iq2000.cpu

diff --git a/binutils/binutils-2.21/cpu/iq2000.opc b/cpu/iq2000.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/iq2000.opc
rename to cpu/iq2000.opc

diff --git a/binutils/binutils-2.21/cpu/iq2000m.cpu b/cpu/iq2000m.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/iq2000m.cpu
rename to cpu/iq2000m.cpu

diff --git a/binutils/binutils-2.21/cpu/lm32.cpu b/cpu/lm32.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/lm32.cpu
rename to cpu/lm32.cpu

diff --git a/binutils/binutils-2.21/cpu/lm32.opc b/cpu/lm32.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/lm32.opc
rename to cpu/lm32.opc

diff --git a/binutils/binutils-2.21/cpu/m32c.cpu b/cpu/m32c.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/m32c.cpu
rename to cpu/m32c.cpu

diff --git a/binutils/binutils-2.21/cpu/m32c.opc b/cpu/m32c.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/m32c.opc
rename to cpu/m32c.opc

diff --git a/binutils/binutils-2.21/cpu/m32r.cpu b/cpu/m32r.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/m32r.cpu
rename to cpu/m32r.cpu

diff --git a/binutils/binutils-2.21/cpu/m32r.opc b/cpu/m32r.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/m32r.opc
rename to cpu/m32r.opc

diff --git a/binutils/binutils-2.21/cpu/mt.cpu b/cpu/mt.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/mt.cpu
rename to cpu/mt.cpu

diff --git a/binutils/binutils-2.21/cpu/mt.opc b/cpu/mt.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/mt.opc
rename to cpu/mt.opc

diff --git a/binutils/binutils-2.21/cpu/sh.cpu b/cpu/sh.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/sh.cpu
rename to cpu/sh.cpu

diff --git a/binutils/binutils-2.21/cpu/sh.opc b/cpu/sh.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/sh.opc
rename to cpu/sh.opc

diff --git a/binutils/binutils-2.21/cpu/sh64-compact.cpu b/cpu/sh64-compact.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/sh64-compact.cpu
rename to cpu/sh64-compact.cpu

diff --git a/binutils/binutils-2.21/cpu/sh64-media.cpu b/cpu/sh64-media.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/sh64-media.cpu
rename to cpu/sh64-media.cpu

diff --git a/binutils/binutils-2.21/cpu/simplify.inc b/cpu/simplify.inc
similarity index 100%
rename from binutils/binutils-2.21/cpu/simplify.inc
rename to cpu/simplify.inc

diff --git a/binutils/binutils-2.21/cpu/xc16x.cpu b/cpu/xc16x.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/xc16x.cpu
rename to cpu/xc16x.cpu

diff --git a/binutils/binutils-2.21/cpu/xc16x.opc b/cpu/xc16x.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/xc16x.opc
rename to cpu/xc16x.opc

diff --git a/binutils/binutils-2.21/depcomp b/depcomp
similarity index 100%
rename from binutils/binutils-2.21/depcomp
rename to depcomp

diff --git a/binutils/binutils-2.21/elfcpp/ChangeLog b/elfcpp/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/ChangeLog
rename to elfcpp/ChangeLog

diff --git a/binutils/binutils-2.21/elfcpp/README b/elfcpp/README
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/README
rename to elfcpp/README

diff --git a/binutils/binutils-2.21/elfcpp/arm.h b/elfcpp/arm.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/arm.h
rename to elfcpp/arm.h

diff --git a/binutils/binutils-2.21/elfcpp/dwarf.h b/elfcpp/dwarf.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/dwarf.h
rename to elfcpp/dwarf.h

diff --git a/binutils/binutils-2.21/elfcpp/elfcpp.h b/elfcpp/elfcpp.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/elfcpp.h
rename to elfcpp/elfcpp.h

diff --git a/binutils/binutils-2.21/elfcpp/elfcpp_file.h b/elfcpp/elfcpp_file.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/elfcpp_file.h
rename to elfcpp/elfcpp_file.h

diff --git a/binutils/binutils-2.21/elfcpp/elfcpp_internal.h b/elfcpp/elfcpp_internal.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/elfcpp_internal.h
rename to elfcpp/elfcpp_internal.h

diff --git a/binutils/binutils-2.21/elfcpp/elfcpp_swap.h b/elfcpp/elfcpp_swap.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/elfcpp_swap.h
rename to elfcpp/elfcpp_swap.h

diff --git a/binutils/binutils-2.21/elfcpp/i386.h b/elfcpp/i386.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/i386.h
rename to elfcpp/i386.h

diff --git a/binutils/binutils-2.21/elfcpp/powerpc.h b/elfcpp/powerpc.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/powerpc.h
rename to elfcpp/powerpc.h

diff --git a/binutils/binutils-2.21/elfcpp/sparc.h b/elfcpp/sparc.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/sparc.h
rename to elfcpp/sparc.h

diff --git a/binutils/binutils-2.21/elfcpp/x86_64.h b/elfcpp/x86_64.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/x86_64.h
rename to elfcpp/x86_64.h

diff --git a/binutils/binutils-2.21/etc/ChangeLog b/etc/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/etc/ChangeLog
rename to etc/ChangeLog

diff --git a/binutils/binutils-2.21/etc/Makefile.in b/etc/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/etc/Makefile.in
rename to etc/Makefile.in

diff --git a/binutils/binutils-2.21/etc/configbuild.ein b/etc/configbuild.ein
similarity index 100%
rename from binutils/binutils-2.21/etc/configbuild.ein
rename to etc/configbuild.ein

diff --git a/binutils/binutils-2.21/etc/configbuild.fig b/etc/configbuild.fig
similarity index 100%
rename from binutils/binutils-2.21/etc/configbuild.fig
rename to etc/configbuild.fig

diff --git a/binutils/binutils-2.21/etc/configbuild.jin b/etc/configbuild.jin
similarity index 100%
rename from binutils/binutils-2.21/etc/configbuild.jin
rename to etc/configbuild.jin
Binary files differ

diff --git a/binutils/binutils-2.21/etc/configbuild.tin b/etc/configbuild.tin
similarity index 100%
rename from binutils/binutils-2.21/etc/configbuild.tin
rename to etc/configbuild.tin

diff --git a/binutils/binutils-2.21/etc/configdev.ein b/etc/configdev.ein
similarity index 100%
rename from binutils/binutils-2.21/etc/configdev.ein
rename to etc/configdev.ein

diff --git a/binutils/binutils-2.21/etc/configdev.fig b/etc/configdev.fig
similarity index 100%
rename from binutils/binutils-2.21/etc/configdev.fig
rename to etc/configdev.fig

diff --git a/binutils/binutils-2.21/etc/configdev.jin b/etc/configdev.jin
similarity index 100%
rename from binutils/binutils-2.21/etc/configdev.jin
rename to etc/configdev.jin
Binary files differ

diff --git a/binutils/binutils-2.21/etc/configdev.tin b/etc/configdev.tin
similarity index 100%
rename from binutils/binutils-2.21/etc/configdev.tin
rename to etc/configdev.tin

diff --git a/binutils/binutils-2.21/etc/configure b/etc/configure
similarity index 100%
rename from binutils/binutils-2.21/etc/configure
rename to etc/configure

diff --git a/binutils/binutils-2.21/etc/configure.in b/etc/configure.in
similarity index 100%
rename from binutils/binutils-2.21/etc/configure.in
rename to etc/configure.in

diff --git a/binutils/binutils-2.21/etc/configure.texi b/etc/configure.texi
similarity index 100%
rename from binutils/binutils-2.21/etc/configure.texi
rename to etc/configure.texi

diff --git a/binutils/binutils-2.21/etc/fdl.texi b/etc/fdl.texi
similarity index 100%
rename from binutils/binutils-2.21/etc/fdl.texi
rename to etc/fdl.texi

diff --git a/binutils/binutils-2.21/etc/gnu-oids.texi b/etc/gnu-oids.texi
similarity index 100%
rename from binutils/binutils-2.21/etc/gnu-oids.texi
rename to etc/gnu-oids.texi

diff --git a/binutils/binutils-2.21/etc/make-stds.texi b/etc/make-stds.texi
similarity index 100%
rename from binutils/binutils-2.21/etc/make-stds.texi
rename to etc/make-stds.texi

diff --git a/binutils/binutils-2.21/etc/standards.texi b/etc/standards.texi
similarity index 100%
rename from binutils/binutils-2.21/etc/standards.texi
rename to etc/standards.texi

diff --git a/binutils/binutils-2.21/etc/texi2pod.pl b/etc/texi2pod.pl
similarity index 100%
rename from binutils/binutils-2.21/etc/texi2pod.pl
rename to etc/texi2pod.pl

diff --git a/binutils/binutils-2.21/gas/CONTRIBUTORS b/gas/CONTRIBUTORS
similarity index 100%
rename from binutils/binutils-2.21/gas/CONTRIBUTORS
rename to gas/CONTRIBUTORS

diff --git a/binutils/binutils-2.21/gas/COPYING b/gas/COPYING
similarity index 100%
rename from binutils/binutils-2.21/gas/COPYING
rename to gas/COPYING

diff --git a/binutils/binutils-2.21/gas/ChangeLog b/gas/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog
rename to gas/ChangeLog

diff --git a/binutils/binutils-2.21/gas/ChangeLog-0001 b/gas/ChangeLog-0001
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-0001
rename to gas/ChangeLog-0001

diff --git a/binutils/binutils-2.21/gas/ChangeLog-0203 b/gas/ChangeLog-0203
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-0203
rename to gas/ChangeLog-0203

diff --git a/binutils/binutils-2.21/gas/ChangeLog-2004 b/gas/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2004
rename to gas/ChangeLog-2004

diff --git a/binutils/binutils-2.21/gas/ChangeLog-2005 b/gas/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2005
rename to gas/ChangeLog-2005

diff --git a/binutils/binutils-2.21/gas/ChangeLog-2006 b/gas/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2006
rename to gas/ChangeLog-2006

diff --git a/binutils/binutils-2.21/gas/ChangeLog-2007 b/gas/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2007
rename to gas/ChangeLog-2007

diff --git a/binutils/binutils-2.21/gas/ChangeLog-2008 b/gas/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2008
rename to gas/ChangeLog-2008

diff --git a/binutils/binutils-2.21/gas/ChangeLog-2009 b/gas/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2009
rename to gas/ChangeLog-2009

diff --git a/binutils/binutils-2.21/gas/ChangeLog-9295 b/gas/ChangeLog-9295
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-9295
rename to gas/ChangeLog-9295

diff --git a/binutils/binutils-2.21/gas/ChangeLog-9697 b/gas/ChangeLog-9697
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-9697
rename to gas/ChangeLog-9697

diff --git a/binutils/binutils-2.21/gas/ChangeLog-9899 b/gas/ChangeLog-9899
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-9899
rename to gas/ChangeLog-9899

diff --git a/binutils/binutils-2.21/gas/MAINTAINERS b/gas/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/gas/MAINTAINERS
rename to gas/MAINTAINERS

diff --git a/binutils/binutils-2.21/gas/Makefile.am b/gas/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/gas/Makefile.am
rename to gas/Makefile.am

diff --git a/binutils/binutils-2.21/gas/Makefile.in b/gas/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/gas/Makefile.in
rename to gas/Makefile.in

diff --git a/binutils/binutils-2.21/gas/NEWS b/gas/NEWS
similarity index 100%
rename from binutils/binutils-2.21/gas/NEWS
rename to gas/NEWS

diff --git a/binutils/binutils-2.21/gas/README b/gas/README
similarity index 100%
rename from binutils/binutils-2.21/gas/README
rename to gas/README

diff --git a/binutils/binutils-2.21/gas/acinclude.m4 b/gas/acinclude.m4
similarity index 100%
rename from binutils/binutils-2.21/gas/acinclude.m4
rename to gas/acinclude.m4

diff --git a/binutils/binutils-2.21/gas/aclocal.m4 b/gas/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/gas/aclocal.m4
rename to gas/aclocal.m4

diff --git a/binutils/binutils-2.21/gas/app.c b/gas/app.c
similarity index 100%
rename from binutils/binutils-2.21/gas/app.c
rename to gas/app.c

diff --git a/binutils/binutils-2.21/gas/as.c b/gas/as.c
similarity index 100%
rename from binutils/binutils-2.21/gas/as.c
rename to gas/as.c

diff --git a/binutils/binutils-2.21/gas/as.h b/gas/as.h
similarity index 100%
rename from binutils/binutils-2.21/gas/as.h
rename to gas/as.h

diff --git a/binutils/binutils-2.21/gas/asintl.h b/gas/asintl.h
similarity index 100%
rename from binutils/binutils-2.21/gas/asintl.h
rename to gas/asintl.h

diff --git a/binutils/binutils-2.21/gas/atof-generic.c b/gas/atof-generic.c
similarity index 100%
rename from binutils/binutils-2.21/gas/atof-generic.c
rename to gas/atof-generic.c

diff --git a/binutils/binutils-2.21/gas/bfin-lex.c b/gas/bfin-lex.c
similarity index 100%
rename from binutils/binutils-2.21/gas/bfin-lex.c
rename to gas/bfin-lex.c

diff --git a/binutils/binutils-2.21/gas/bfin-parse.c b/gas/bfin-parse.c
similarity index 100%
rename from binutils/binutils-2.21/gas/bfin-parse.c
rename to gas/bfin-parse.c

diff --git a/binutils/binutils-2.21/gas/bfin-parse.h b/gas/bfin-parse.h
similarity index 100%
rename from binutils/binutils-2.21/gas/bfin-parse.h
rename to gas/bfin-parse.h

diff --git a/binutils/binutils-2.21/gas/bignum.h b/gas/bignum.h
similarity index 100%
rename from binutils/binutils-2.21/gas/bignum.h
rename to gas/bignum.h

diff --git a/binutils/binutils-2.21/gas/bit_fix.h b/gas/bit_fix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/bit_fix.h
rename to gas/bit_fix.h

diff --git a/binutils/binutils-2.21/gas/cgen.c b/gas/cgen.c
similarity index 100%
rename from binutils/binutils-2.21/gas/cgen.c
rename to gas/cgen.c

diff --git a/binutils/binutils-2.21/gas/cgen.h b/gas/cgen.h
similarity index 100%
rename from binutils/binutils-2.21/gas/cgen.h
rename to gas/cgen.h

diff --git a/binutils/binutils-2.21/gas/compress-debug.c b/gas/compress-debug.c
similarity index 100%
rename from binutils/binutils-2.21/gas/compress-debug.c
rename to gas/compress-debug.c

diff --git a/binutils/binutils-2.21/gas/compress-debug.h b/gas/compress-debug.h
similarity index 100%
rename from binutils/binutils-2.21/gas/compress-debug.h
rename to gas/compress-debug.h

diff --git a/binutils/binutils-2.21/gas/cond.c b/gas/cond.c
similarity index 100%
rename from binutils/binutils-2.21/gas/cond.c
rename to gas/cond.c

diff --git a/binutils/binutils-2.21/gas/config.in b/gas/config.in
similarity index 100%
rename from binutils/binutils-2.21/gas/config.in
rename to gas/config.in

diff --git a/binutils/binutils-2.21/gas/config/aout_gnu.h b/gas/config/aout_gnu.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/aout_gnu.h
rename to gas/config/aout_gnu.h

diff --git a/binutils/binutils-2.21/gas/config/atof-ieee.c b/gas/config/atof-ieee.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/atof-ieee.c
rename to gas/config/atof-ieee.c

diff --git a/binutils/binutils-2.21/gas/config/atof-vax.c b/gas/config/atof-vax.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/atof-vax.c
rename to gas/config/atof-vax.c

diff --git a/binutils/binutils-2.21/gas/config/bfin-aux.h b/gas/config/bfin-aux.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/bfin-aux.h
rename to gas/config/bfin-aux.h

diff --git a/binutils/binutils-2.21/gas/config/bfin-defs.h b/gas/config/bfin-defs.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/bfin-defs.h
rename to gas/config/bfin-defs.h

diff --git a/binutils/binutils-2.21/gas/config/bfin-lex.l b/gas/config/bfin-lex.l
similarity index 100%
rename from binutils/binutils-2.21/gas/config/bfin-lex.l
rename to gas/config/bfin-lex.l

diff --git a/binutils/binutils-2.21/gas/config/bfin-parse.y b/gas/config/bfin-parse.y
similarity index 100%
rename from binutils/binutils-2.21/gas/config/bfin-parse.y
rename to gas/config/bfin-parse.y

diff --git a/binutils/binutils-2.21/gas/config/e-crisaout.c b/gas/config/e-crisaout.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-crisaout.c
rename to gas/config/e-crisaout.c

diff --git a/binutils/binutils-2.21/gas/config/e-criself.c b/gas/config/e-criself.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-criself.c
rename to gas/config/e-criself.c

diff --git a/binutils/binutils-2.21/gas/config/e-i386aout.c b/gas/config/e-i386aout.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-i386aout.c
rename to gas/config/e-i386aout.c

diff --git a/binutils/binutils-2.21/gas/config/e-i386coff.c b/gas/config/e-i386coff.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-i386coff.c
rename to gas/config/e-i386coff.c

diff --git a/binutils/binutils-2.21/gas/config/e-i386elf.c b/gas/config/e-i386elf.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-i386elf.c
rename to gas/config/e-i386elf.c

diff --git a/binutils/binutils-2.21/gas/config/e-mipsecoff.c b/gas/config/e-mipsecoff.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-mipsecoff.c
rename to gas/config/e-mipsecoff.c

diff --git a/binutils/binutils-2.21/gas/config/e-mipself.c b/gas/config/e-mipself.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-mipself.c
rename to gas/config/e-mipself.c

diff --git a/binutils/binutils-2.21/gas/config/itbl-mips.h b/gas/config/itbl-mips.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/itbl-mips.h
rename to gas/config/itbl-mips.h

diff --git a/binutils/binutils-2.21/gas/config/m68k-parse.h b/gas/config/m68k-parse.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/m68k-parse.h
rename to gas/config/m68k-parse.h

diff --git a/binutils/binutils-2.21/gas/config/m68k-parse.y b/gas/config/m68k-parse.y
similarity index 100%
rename from binutils/binutils-2.21/gas/config/m68k-parse.y
rename to gas/config/m68k-parse.y

diff --git a/binutils/binutils-2.21/gas/config/obj-aout.c b/gas/config/obj-aout.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-aout.c
rename to gas/config/obj-aout.c

diff --git a/binutils/binutils-2.21/gas/config/obj-aout.h b/gas/config/obj-aout.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-aout.h
rename to gas/config/obj-aout.h

diff --git a/binutils/binutils-2.21/gas/config/obj-coff-seh.c b/gas/config/obj-coff-seh.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-coff-seh.c
rename to gas/config/obj-coff-seh.c

diff --git a/binutils/binutils-2.21/gas/config/obj-coff-seh.h b/gas/config/obj-coff-seh.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-coff-seh.h
rename to gas/config/obj-coff-seh.h

diff --git a/binutils/binutils-2.21/gas/config/obj-coff.c b/gas/config/obj-coff.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-coff.c
rename to gas/config/obj-coff.c

diff --git a/binutils/binutils-2.21/gas/config/obj-coff.h b/gas/config/obj-coff.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-coff.h
rename to gas/config/obj-coff.h

diff --git a/binutils/binutils-2.21/gas/config/obj-ecoff.c b/gas/config/obj-ecoff.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-ecoff.c
rename to gas/config/obj-ecoff.c

diff --git a/binutils/binutils-2.21/gas/config/obj-ecoff.h b/gas/config/obj-ecoff.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-ecoff.h
rename to gas/config/obj-ecoff.h

diff --git a/binutils/binutils-2.21/gas/config/obj-elf.c b/gas/config/obj-elf.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-elf.c
rename to gas/config/obj-elf.c

diff --git a/binutils/binutils-2.21/gas/config/obj-elf.h b/gas/config/obj-elf.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-elf.h
rename to gas/config/obj-elf.h

diff --git a/binutils/binutils-2.21/gas/config/obj-evax.c b/gas/config/obj-evax.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-evax.c
rename to gas/config/obj-evax.c

diff --git a/binutils/binutils-2.21/gas/config/obj-evax.h b/gas/config/obj-evax.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-evax.h
rename to gas/config/obj-evax.h

diff --git a/binutils/binutils-2.21/gas/config/obj-fdpicelf.c b/gas/config/obj-fdpicelf.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-fdpicelf.c
rename to gas/config/obj-fdpicelf.c

diff --git a/binutils/binutils-2.21/gas/config/obj-fdpicelf.h b/gas/config/obj-fdpicelf.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-fdpicelf.h
rename to gas/config/obj-fdpicelf.h

diff --git a/binutils/binutils-2.21/gas/config/obj-macho.c b/gas/config/obj-macho.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-macho.c
rename to gas/config/obj-macho.c

diff --git a/binutils/binutils-2.21/gas/config/obj-macho.h b/gas/config/obj-macho.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-macho.h
rename to gas/config/obj-macho.h

diff --git a/binutils/binutils-2.21/gas/config/obj-multi.c b/gas/config/obj-multi.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-multi.c
rename to gas/config/obj-multi.c

diff --git a/binutils/binutils-2.21/gas/config/obj-multi.h b/gas/config/obj-multi.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-multi.h
rename to gas/config/obj-multi.h

diff --git a/binutils/binutils-2.21/gas/config/obj-som.c b/gas/config/obj-som.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-som.c
rename to gas/config/obj-som.c

diff --git a/binutils/binutils-2.21/gas/config/obj-som.h b/gas/config/obj-som.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-som.h
rename to gas/config/obj-som.h

diff --git a/binutils/binutils-2.21/gas/config/rx-defs.h b/gas/config/rx-defs.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/rx-defs.h
rename to gas/config/rx-defs.h

diff --git a/binutils/binutils-2.21/gas/config/rx-parse.y b/gas/config/rx-parse.y
similarity index 100%
rename from binutils/binutils-2.21/gas/config/rx-parse.y
rename to gas/config/rx-parse.y

diff --git a/binutils/binutils-2.21/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-alpha.c
rename to gas/config/tc-alpha.c

diff --git a/binutils/binutils-2.21/gas/config/tc-alpha.h b/gas/config/tc-alpha.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-alpha.h
rename to gas/config/tc-alpha.h

diff --git a/binutils/binutils-2.21/gas/config/tc-arc.c b/gas/config/tc-arc.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-arc.c
rename to gas/config/tc-arc.c

diff --git a/binutils/binutils-2.21/gas/config/tc-arc.h b/gas/config/tc-arc.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-arc.h
rename to gas/config/tc-arc.h

diff --git a/binutils/binutils-2.21/gas/config/tc-arm.c b/gas/config/tc-arm.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-arm.c
rename to gas/config/tc-arm.c

diff --git a/binutils/binutils-2.21/gas/config/tc-arm.h b/gas/config/tc-arm.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-arm.h
rename to gas/config/tc-arm.h

diff --git a/binutils/binutils-2.21/gas/config/tc-avr.c b/gas/config/tc-avr.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-avr.c
rename to gas/config/tc-avr.c

diff --git a/binutils/binutils-2.21/gas/config/tc-avr.h b/gas/config/tc-avr.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-avr.h
rename to gas/config/tc-avr.h

diff --git a/binutils/binutils-2.21/gas/config/tc-bfin.c b/gas/config/tc-bfin.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-bfin.c
rename to gas/config/tc-bfin.c

diff --git a/binutils/binutils-2.21/gas/config/tc-bfin.h b/gas/config/tc-bfin.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-bfin.h
rename to gas/config/tc-bfin.h

diff --git a/binutils/binutils-2.21/gas/config/tc-cr16.c b/gas/config/tc-cr16.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-cr16.c
rename to gas/config/tc-cr16.c

diff --git a/binutils/binutils-2.21/gas/config/tc-cr16.h b/gas/config/tc-cr16.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-cr16.h
rename to gas/config/tc-cr16.h

diff --git a/binutils/binutils-2.21/gas/config/tc-cris.c b/gas/config/tc-cris.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-cris.c
rename to gas/config/tc-cris.c

diff --git a/binutils/binutils-2.21/gas/config/tc-cris.h b/gas/config/tc-cris.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-cris.h
rename to gas/config/tc-cris.h

diff --git a/binutils/binutils-2.21/gas/config/tc-crx.c b/gas/config/tc-crx.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-crx.c
rename to gas/config/tc-crx.c

diff --git a/binutils/binutils-2.21/gas/config/tc-crx.h b/gas/config/tc-crx.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-crx.h
rename to gas/config/tc-crx.h

diff --git a/binutils/binutils-2.21/gas/config/tc-d10v.c b/gas/config/tc-d10v.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-d10v.c
rename to gas/config/tc-d10v.c

diff --git a/binutils/binutils-2.21/gas/config/tc-d10v.h b/gas/config/tc-d10v.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-d10v.h
rename to gas/config/tc-d10v.h

diff --git a/binutils/binutils-2.21/gas/config/tc-d30v.c b/gas/config/tc-d30v.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-d30v.c
rename to gas/config/tc-d30v.c

diff --git a/binutils/binutils-2.21/gas/config/tc-d30v.h b/gas/config/tc-d30v.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-d30v.h
rename to gas/config/tc-d30v.h

diff --git a/binutils/binutils-2.21/gas/config/tc-dlx.c b/gas/config/tc-dlx.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-dlx.c
rename to gas/config/tc-dlx.c

diff --git a/binutils/binutils-2.21/gas/config/tc-dlx.h b/gas/config/tc-dlx.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-dlx.h
rename to gas/config/tc-dlx.h

diff --git a/binutils/binutils-2.21/gas/config/tc-fr30.c b/gas/config/tc-fr30.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-fr30.c
rename to gas/config/tc-fr30.c

diff --git a/binutils/binutils-2.21/gas/config/tc-fr30.h b/gas/config/tc-fr30.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-fr30.h
rename to gas/config/tc-fr30.h

diff --git a/binutils/binutils-2.21/gas/config/tc-frv.c b/gas/config/tc-frv.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-frv.c
rename to gas/config/tc-frv.c

diff --git a/binutils/binutils-2.21/gas/config/tc-frv.h b/gas/config/tc-frv.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-frv.h
rename to gas/config/tc-frv.h

diff --git a/binutils/binutils-2.21/gas/config/tc-generic.c b/gas/config/tc-generic.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-generic.c
rename to gas/config/tc-generic.c

diff --git a/binutils/binutils-2.21/gas/config/tc-generic.h b/gas/config/tc-generic.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-generic.h
rename to gas/config/tc-generic.h

diff --git a/binutils/binutils-2.21/gas/config/tc-h8300.c b/gas/config/tc-h8300.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-h8300.c
rename to gas/config/tc-h8300.c

diff --git a/binutils/binutils-2.21/gas/config/tc-h8300.h b/gas/config/tc-h8300.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-h8300.h
rename to gas/config/tc-h8300.h

diff --git a/binutils/binutils-2.21/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-hppa.c
rename to gas/config/tc-hppa.c

diff --git a/binutils/binutils-2.21/gas/config/tc-hppa.h b/gas/config/tc-hppa.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-hppa.h
rename to gas/config/tc-hppa.h

diff --git a/binutils/binutils-2.21/gas/config/tc-i370.c b/gas/config/tc-i370.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i370.c
rename to gas/config/tc-i370.c

diff --git a/binutils/binutils-2.21/gas/config/tc-i370.h b/gas/config/tc-i370.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i370.h
rename to gas/config/tc-i370.h

diff --git a/binutils/binutils-2.21/gas/config/tc-i386-intel.c b/gas/config/tc-i386-intel.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i386-intel.c
rename to gas/config/tc-i386-intel.c

diff --git a/binutils/binutils-2.21/gas/config/tc-i386.c b/gas/config/tc-i386.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i386.c
rename to gas/config/tc-i386.c

diff --git a/binutils/binutils-2.21/gas/config/tc-i386.h b/gas/config/tc-i386.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i386.h
rename to gas/config/tc-i386.h

diff --git a/binutils/binutils-2.21/gas/config/tc-i860.c b/gas/config/tc-i860.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i860.c
rename to gas/config/tc-i860.c

diff --git a/binutils/binutils-2.21/gas/config/tc-i860.h b/gas/config/tc-i860.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i860.h
rename to gas/config/tc-i860.h

diff --git a/binutils/binutils-2.21/gas/config/tc-i960.c b/gas/config/tc-i960.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i960.c
rename to gas/config/tc-i960.c

diff --git a/binutils/binutils-2.21/gas/config/tc-i960.h b/gas/config/tc-i960.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i960.h
rename to gas/config/tc-i960.h

diff --git a/binutils/binutils-2.21/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ia64.c
rename to gas/config/tc-ia64.c

diff --git a/binutils/binutils-2.21/gas/config/tc-ia64.h b/gas/config/tc-ia64.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ia64.h
rename to gas/config/tc-ia64.h

diff --git a/binutils/binutils-2.21/gas/config/tc-ip2k.c b/gas/config/tc-ip2k.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ip2k.c
rename to gas/config/tc-ip2k.c

diff --git a/binutils/binutils-2.21/gas/config/tc-ip2k.h b/gas/config/tc-ip2k.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ip2k.h
rename to gas/config/tc-ip2k.h

diff --git a/binutils/binutils-2.21/gas/config/tc-iq2000.c b/gas/config/tc-iq2000.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-iq2000.c
rename to gas/config/tc-iq2000.c

diff --git a/binutils/binutils-2.21/gas/config/tc-iq2000.h b/gas/config/tc-iq2000.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-iq2000.h
rename to gas/config/tc-iq2000.h

diff --git a/binutils/binutils-2.21/gas/config/tc-lm32.c b/gas/config/tc-lm32.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-lm32.c
rename to gas/config/tc-lm32.c

diff --git a/binutils/binutils-2.21/gas/config/tc-lm32.h b/gas/config/tc-lm32.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-lm32.h
rename to gas/config/tc-lm32.h

diff --git a/binutils/binutils-2.21/gas/config/tc-m32c.c b/gas/config/tc-m32c.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m32c.c
rename to gas/config/tc-m32c.c

diff --git a/binutils/binutils-2.21/gas/config/tc-m32c.h b/gas/config/tc-m32c.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m32c.h
rename to gas/config/tc-m32c.h

diff --git a/binutils/binutils-2.21/gas/config/tc-m32r.c b/gas/config/tc-m32r.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m32r.c
rename to gas/config/tc-m32r.c

diff --git a/binutils/binutils-2.21/gas/config/tc-m32r.h b/gas/config/tc-m32r.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m32r.h
rename to gas/config/tc-m32r.h

diff --git a/binutils/binutils-2.21/gas/config/tc-m68851.h b/gas/config/tc-m68851.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m68851.h
rename to gas/config/tc-m68851.h

diff --git a/binutils/binutils-2.21/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m68hc11.c
rename to gas/config/tc-m68hc11.c

diff --git a/binutils/binutils-2.21/gas/config/tc-m68hc11.h b/gas/config/tc-m68hc11.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m68hc11.h
rename to gas/config/tc-m68hc11.h

diff --git a/binutils/binutils-2.21/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m68k.c
rename to gas/config/tc-m68k.c

diff --git a/binutils/binutils-2.21/gas/config/tc-m68k.h b/gas/config/tc-m68k.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m68k.h
rename to gas/config/tc-m68k.h

diff --git a/binutils/binutils-2.21/gas/config/tc-mcore.c b/gas/config/tc-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mcore.c
rename to gas/config/tc-mcore.c

diff --git a/binutils/binutils-2.21/gas/config/tc-mcore.h b/gas/config/tc-mcore.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mcore.h
rename to gas/config/tc-mcore.h

diff --git a/binutils/binutils-2.21/gas/config/tc-mep.c b/gas/config/tc-mep.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mep.c
rename to gas/config/tc-mep.c

diff --git a/binutils/binutils-2.21/gas/config/tc-mep.h b/gas/config/tc-mep.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mep.h
rename to gas/config/tc-mep.h

diff --git a/binutils/binutils-2.21/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-microblaze.c
rename to gas/config/tc-microblaze.c

diff --git a/binutils/binutils-2.21/gas/config/tc-microblaze.h b/gas/config/tc-microblaze.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-microblaze.h
rename to gas/config/tc-microblaze.h

diff --git a/binutils/binutils-2.21/gas/config/tc-mips.c b/gas/config/tc-mips.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mips.c
rename to gas/config/tc-mips.c

diff --git a/binutils/binutils-2.21/gas/config/tc-mips.h b/gas/config/tc-mips.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mips.h
rename to gas/config/tc-mips.h

diff --git a/binutils/binutils-2.21/gas/config/tc-mmix.c b/gas/config/tc-mmix.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mmix.c
rename to gas/config/tc-mmix.c

diff --git a/binutils/binutils-2.21/gas/config/tc-mmix.h b/gas/config/tc-mmix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mmix.h
rename to gas/config/tc-mmix.h

diff --git a/binutils/binutils-2.21/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mn10200.c
rename to gas/config/tc-mn10200.c

diff --git a/binutils/binutils-2.21/gas/config/tc-mn10200.h b/gas/config/tc-mn10200.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mn10200.h
rename to gas/config/tc-mn10200.h

diff --git a/binutils/binutils-2.21/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mn10300.c
rename to gas/config/tc-mn10300.c

diff --git a/binutils/binutils-2.21/gas/config/tc-mn10300.h b/gas/config/tc-mn10300.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mn10300.h
rename to gas/config/tc-mn10300.h

diff --git a/binutils/binutils-2.21/gas/config/tc-moxie.c b/gas/config/tc-moxie.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-moxie.c
rename to gas/config/tc-moxie.c

diff --git a/binutils/binutils-2.21/gas/config/tc-moxie.h b/gas/config/tc-moxie.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-moxie.h
rename to gas/config/tc-moxie.h

diff --git a/binutils/binutils-2.21/gas/config/tc-msp430.c b/gas/config/tc-msp430.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-msp430.c
rename to gas/config/tc-msp430.c

diff --git a/binutils/binutils-2.21/gas/config/tc-msp430.h b/gas/config/tc-msp430.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-msp430.h
rename to gas/config/tc-msp430.h

diff --git a/binutils/binutils-2.21/gas/config/tc-mt.c b/gas/config/tc-mt.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mt.c
rename to gas/config/tc-mt.c

diff --git a/binutils/binutils-2.21/gas/config/tc-mt.h b/gas/config/tc-mt.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mt.h
rename to gas/config/tc-mt.h

diff --git a/binutils/binutils-2.21/gas/config/tc-ns32k.c b/gas/config/tc-ns32k.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ns32k.c
rename to gas/config/tc-ns32k.c

diff --git a/binutils/binutils-2.21/gas/config/tc-ns32k.h b/gas/config/tc-ns32k.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ns32k.h
rename to gas/config/tc-ns32k.h

diff --git a/binutils/binutils-2.21/gas/config/tc-openrisc.c b/gas/config/tc-openrisc.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-openrisc.c
rename to gas/config/tc-openrisc.c

diff --git a/binutils/binutils-2.21/gas/config/tc-openrisc.h b/gas/config/tc-openrisc.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-openrisc.h
rename to gas/config/tc-openrisc.h

diff --git a/binutils/binutils-2.21/gas/config/tc-or32.c b/gas/config/tc-or32.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-or32.c
rename to gas/config/tc-or32.c

diff --git a/binutils/binutils-2.21/gas/config/tc-or32.h b/gas/config/tc-or32.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-or32.h
rename to gas/config/tc-or32.h

diff --git a/binutils/binutils-2.21/gas/config/tc-pdp11.c b/gas/config/tc-pdp11.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-pdp11.c
rename to gas/config/tc-pdp11.c

diff --git a/binutils/binutils-2.21/gas/config/tc-pdp11.h b/gas/config/tc-pdp11.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-pdp11.h
rename to gas/config/tc-pdp11.h

diff --git a/binutils/binutils-2.21/gas/config/tc-pj.c b/gas/config/tc-pj.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-pj.c
rename to gas/config/tc-pj.c

diff --git a/binutils/binutils-2.21/gas/config/tc-pj.h b/gas/config/tc-pj.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-pj.h
rename to gas/config/tc-pj.h

diff --git a/binutils/binutils-2.21/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ppc.c
rename to gas/config/tc-ppc.c

diff --git a/binutils/binutils-2.21/gas/config/tc-ppc.h b/gas/config/tc-ppc.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ppc.h
rename to gas/config/tc-ppc.h

diff --git a/binutils/binutils-2.21/gas/config/tc-rx.c b/gas/config/tc-rx.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-rx.c
rename to gas/config/tc-rx.c

diff --git a/binutils/binutils-2.21/gas/config/tc-rx.h b/gas/config/tc-rx.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-rx.h
rename to gas/config/tc-rx.h

diff --git a/binutils/binutils-2.21/gas/config/tc-s390.c b/gas/config/tc-s390.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-s390.c
rename to gas/config/tc-s390.c

diff --git a/binutils/binutils-2.21/gas/config/tc-s390.h b/gas/config/tc-s390.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-s390.h
rename to gas/config/tc-s390.h

diff --git a/binutils/binutils-2.21/gas/config/tc-score.c b/gas/config/tc-score.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-score.c
rename to gas/config/tc-score.c

diff --git a/binutils/binutils-2.21/gas/config/tc-score.h b/gas/config/tc-score.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-score.h
rename to gas/config/tc-score.h

diff --git a/binutils/binutils-2.21/gas/config/tc-score7.c b/gas/config/tc-score7.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-score7.c
rename to gas/config/tc-score7.c

diff --git a/binutils/binutils-2.21/gas/config/tc-sh.c b/gas/config/tc-sh.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sh.c
rename to gas/config/tc-sh.c

diff --git a/binutils/binutils-2.21/gas/config/tc-sh.h b/gas/config/tc-sh.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sh.h
rename to gas/config/tc-sh.h

diff --git a/binutils/binutils-2.21/gas/config/tc-sh64.c b/gas/config/tc-sh64.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sh64.c
rename to gas/config/tc-sh64.c

diff --git a/binutils/binutils-2.21/gas/config/tc-sh64.h b/gas/config/tc-sh64.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sh64.h
rename to gas/config/tc-sh64.h

diff --git a/binutils/binutils-2.21/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sparc.c
rename to gas/config/tc-sparc.c

diff --git a/binutils/binutils-2.21/gas/config/tc-sparc.h b/gas/config/tc-sparc.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sparc.h
rename to gas/config/tc-sparc.h

diff --git a/binutils/binutils-2.21/gas/config/tc-spu.c b/gas/config/tc-spu.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-spu.c
rename to gas/config/tc-spu.c

diff --git a/binutils/binutils-2.21/gas/config/tc-spu.h b/gas/config/tc-spu.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-spu.h
rename to gas/config/tc-spu.h

diff --git a/binutils/binutils-2.21/gas/config/tc-tic30.c b/gas/config/tc-tic30.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic30.c
rename to gas/config/tc-tic30.c

diff --git a/binutils/binutils-2.21/gas/config/tc-tic30.h b/gas/config/tc-tic30.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic30.h
rename to gas/config/tc-tic30.h

diff --git a/binutils/binutils-2.21/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic4x.c
rename to gas/config/tc-tic4x.c

diff --git a/binutils/binutils-2.21/gas/config/tc-tic4x.h b/gas/config/tc-tic4x.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic4x.h
rename to gas/config/tc-tic4x.h

diff --git a/binutils/binutils-2.21/gas/config/tc-tic54x.c b/gas/config/tc-tic54x.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic54x.c
rename to gas/config/tc-tic54x.c

diff --git a/binutils/binutils-2.21/gas/config/tc-tic54x.h b/gas/config/tc-tic54x.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic54x.h
rename to gas/config/tc-tic54x.h

diff --git a/binutils/binutils-2.21/gas/config/tc-tic6x.c b/gas/config/tc-tic6x.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic6x.c
rename to gas/config/tc-tic6x.c

diff --git a/binutils/binutils-2.21/gas/config/tc-tic6x.h b/gas/config/tc-tic6x.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic6x.h
rename to gas/config/tc-tic6x.h

diff --git a/binutils/binutils-2.21/gas/config/tc-v850.c b/gas/config/tc-v850.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-v850.c
rename to gas/config/tc-v850.c

diff --git a/binutils/binutils-2.21/gas/config/tc-v850.h b/gas/config/tc-v850.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-v850.h
rename to gas/config/tc-v850.h

diff --git a/binutils/binutils-2.21/gas/config/tc-vax.c b/gas/config/tc-vax.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-vax.c
rename to gas/config/tc-vax.c

diff --git a/binutils/binutils-2.21/gas/config/tc-vax.h b/gas/config/tc-vax.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-vax.h
rename to gas/config/tc-vax.h

diff --git a/binutils/binutils-2.21/gas/config/tc-xc16x.c b/gas/config/tc-xc16x.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xc16x.c
rename to gas/config/tc-xc16x.c

diff --git a/binutils/binutils-2.21/gas/config/tc-xc16x.h b/gas/config/tc-xc16x.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xc16x.h
rename to gas/config/tc-xc16x.h

diff --git a/binutils/binutils-2.21/gas/config/tc-xstormy16.c b/gas/config/tc-xstormy16.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xstormy16.c
rename to gas/config/tc-xstormy16.c

diff --git a/binutils/binutils-2.21/gas/config/tc-xstormy16.h b/gas/config/tc-xstormy16.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xstormy16.h
rename to gas/config/tc-xstormy16.h

diff --git a/binutils/binutils-2.21/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xtensa.c
rename to gas/config/tc-xtensa.c

diff --git a/binutils/binutils-2.21/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xtensa.h
rename to gas/config/tc-xtensa.h

diff --git a/binutils/binutils-2.21/gas/config/tc-z80.c b/gas/config/tc-z80.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-z80.c
rename to gas/config/tc-z80.c

diff --git a/binutils/binutils-2.21/gas/config/tc-z80.h b/gas/config/tc-z80.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-z80.h
rename to gas/config/tc-z80.h

diff --git a/binutils/binutils-2.21/gas/config/tc-z8k.c b/gas/config/tc-z8k.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-z8k.c
rename to gas/config/tc-z8k.c

diff --git a/binutils/binutils-2.21/gas/config/tc-z8k.h b/gas/config/tc-z8k.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-z8k.h
rename to gas/config/tc-z8k.h

diff --git a/binutils/binutils-2.21/gas/config/te-386bsd.h b/gas/config/te-386bsd.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-386bsd.h
rename to gas/config/te-386bsd.h

diff --git a/binutils/binutils-2.21/gas/config/te-aix5.h b/gas/config/te-aix5.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-aix5.h
rename to gas/config/te-aix5.h

diff --git a/binutils/binutils-2.21/gas/config/te-armeabi.h b/gas/config/te-armeabi.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-armeabi.h
rename to gas/config/te-armeabi.h

diff --git a/binutils/binutils-2.21/gas/config/te-armlinuxeabi.h b/gas/config/te-armlinuxeabi.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-armlinuxeabi.h
rename to gas/config/te-armlinuxeabi.h

diff --git a/binutils/binutils-2.21/gas/config/te-dynix.h b/gas/config/te-dynix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-dynix.h
rename to gas/config/te-dynix.h

diff --git a/binutils/binutils-2.21/gas/config/te-epoc-pe.h b/gas/config/te-epoc-pe.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-epoc-pe.h
rename to gas/config/te-epoc-pe.h

diff --git a/binutils/binutils-2.21/gas/config/te-freebsd.h b/gas/config/te-freebsd.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-freebsd.h
rename to gas/config/te-freebsd.h

diff --git a/binutils/binutils-2.21/gas/config/te-generic.h b/gas/config/te-generic.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-generic.h
rename to gas/config/te-generic.h

diff --git a/binutils/binutils-2.21/gas/config/te-gnu.h b/gas/config/te-gnu.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-gnu.h
rename to gas/config/te-gnu.h

diff --git a/binutils/binutils-2.21/gas/config/te-go32.h b/gas/config/te-go32.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-go32.h
rename to gas/config/te-go32.h

diff --git a/binutils/binutils-2.21/gas/config/te-hppa.h b/gas/config/te-hppa.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-hppa.h
rename to gas/config/te-hppa.h

diff --git a/binutils/binutils-2.21/gas/config/te-hppa64.h b/gas/config/te-hppa64.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-hppa64.h
rename to gas/config/te-hppa64.h

diff --git a/binutils/binutils-2.21/gas/config/te-hppalinux64.h b/gas/config/te-hppalinux64.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-hppalinux64.h
rename to gas/config/te-hppalinux64.h

diff --git a/binutils/binutils-2.21/gas/config/te-hpux.h b/gas/config/te-hpux.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-hpux.h
rename to gas/config/te-hpux.h

diff --git a/binutils/binutils-2.21/gas/config/te-i386aix.h b/gas/config/te-i386aix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-i386aix.h
rename to gas/config/te-i386aix.h

diff --git a/binutils/binutils-2.21/gas/config/te-ia64aix.h b/gas/config/te-ia64aix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-ia64aix.h
rename to gas/config/te-ia64aix.h

diff --git a/binutils/binutils-2.21/gas/config/te-interix.h b/gas/config/te-interix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-interix.h
rename to gas/config/te-interix.h

diff --git a/binutils/binutils-2.21/gas/config/te-irix.h b/gas/config/te-irix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-irix.h
rename to gas/config/te-irix.h

diff --git a/binutils/binutils-2.21/gas/config/te-linux.h b/gas/config/te-linux.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-linux.h
rename to gas/config/te-linux.h

diff --git a/binutils/binutils-2.21/gas/config/te-lnews.h b/gas/config/te-lnews.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-lnews.h
rename to gas/config/te-lnews.h

diff --git a/binutils/binutils-2.21/gas/config/te-lynx.h b/gas/config/te-lynx.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-lynx.h
rename to gas/config/te-lynx.h

diff --git a/binutils/binutils-2.21/gas/config/te-mach.h b/gas/config/te-mach.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-mach.h
rename to gas/config/te-mach.h

diff --git a/binutils/binutils-2.21/gas/config/te-macos.h b/gas/config/te-macos.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-macos.h
rename to gas/config/te-macos.h

diff --git a/binutils/binutils-2.21/gas/config/te-nbsd.h b/gas/config/te-nbsd.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-nbsd.h
rename to gas/config/te-nbsd.h

diff --git a/binutils/binutils-2.21/gas/config/te-nbsd532.h b/gas/config/te-nbsd532.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-nbsd532.h
rename to gas/config/te-nbsd532.h

diff --git a/binutils/binutils-2.21/gas/config/te-netware.h b/gas/config/te-netware.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-netware.h
rename to gas/config/te-netware.h

diff --git a/binutils/binutils-2.21/gas/config/te-pc532mach.h b/gas/config/te-pc532mach.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-pc532mach.h
rename to gas/config/te-pc532mach.h

diff --git a/binutils/binutils-2.21/gas/config/te-pe.h b/gas/config/te-pe.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-pe.h
rename to gas/config/te-pe.h

diff --git a/binutils/binutils-2.21/gas/config/te-pep.h b/gas/config/te-pep.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-pep.h
rename to gas/config/te-pep.h

diff --git a/binutils/binutils-2.21/gas/config/te-psos.h b/gas/config/te-psos.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-psos.h
rename to gas/config/te-psos.h

diff --git a/binutils/binutils-2.21/gas/config/te-riscix.h b/gas/config/te-riscix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-riscix.h
rename to gas/config/te-riscix.h

diff --git a/binutils/binutils-2.21/gas/config/te-solaris.h b/gas/config/te-solaris.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-solaris.h
rename to gas/config/te-solaris.h

diff --git a/binutils/binutils-2.21/gas/config/te-sparcaout.h b/gas/config/te-sparcaout.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-sparcaout.h
rename to gas/config/te-sparcaout.h

diff --git a/binutils/binutils-2.21/gas/config/te-sun3.h b/gas/config/te-sun3.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-sun3.h
rename to gas/config/te-sun3.h

diff --git a/binutils/binutils-2.21/gas/config/te-svr4.h b/gas/config/te-svr4.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-svr4.h
rename to gas/config/te-svr4.h

diff --git a/binutils/binutils-2.21/gas/config/te-symbian.h b/gas/config/te-symbian.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-symbian.h
rename to gas/config/te-symbian.h

diff --git a/binutils/binutils-2.21/gas/config/te-tmips.h b/gas/config/te-tmips.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-tmips.h
rename to gas/config/te-tmips.h

diff --git a/binutils/binutils-2.21/gas/config/te-uclinux.h b/gas/config/te-uclinux.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-uclinux.h
rename to gas/config/te-uclinux.h

diff --git a/binutils/binutils-2.21/gas/config/te-vms.c b/gas/config/te-vms.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-vms.c
rename to gas/config/te-vms.c

diff --git a/binutils/binutils-2.21/gas/config/te-vms.h b/gas/config/te-vms.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-vms.h
rename to gas/config/te-vms.h

diff --git a/binutils/binutils-2.21/gas/config/te-vxworks.h b/gas/config/te-vxworks.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-vxworks.h
rename to gas/config/te-vxworks.h

diff --git a/binutils/binutils-2.21/gas/config/te-wince-pe.h b/gas/config/te-wince-pe.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-wince-pe.h
rename to gas/config/te-wince-pe.h

diff --git a/binutils/binutils-2.21/gas/config/vax-inst.h b/gas/config/vax-inst.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/vax-inst.h
rename to gas/config/vax-inst.h

diff --git a/binutils/binutils-2.21/gas/config/xtensa-istack.h b/gas/config/xtensa-istack.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/xtensa-istack.h
rename to gas/config/xtensa-istack.h

diff --git a/binutils/binutils-2.21/gas/config/xtensa-relax.c b/gas/config/xtensa-relax.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/xtensa-relax.c
rename to gas/config/xtensa-relax.c

diff --git a/binutils/binutils-2.21/gas/config/xtensa-relax.h b/gas/config/xtensa-relax.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/xtensa-relax.h
rename to gas/config/xtensa-relax.h

diff --git a/binutils/binutils-2.21/gas/configure b/gas/configure
similarity index 100%
rename from binutils/binutils-2.21/gas/configure
rename to gas/configure

diff --git a/binutils/binutils-2.21/gas/configure.com b/gas/configure.com
similarity index 100%
rename from binutils/binutils-2.21/gas/configure.com
rename to gas/configure.com

diff --git a/binutils/binutils-2.21/gas/configure.in b/gas/configure.in
similarity index 100%
rename from binutils/binutils-2.21/gas/configure.in
rename to gas/configure.in

diff --git a/binutils/binutils-2.21/gas/configure.tgt b/gas/configure.tgt
similarity index 100%
rename from binutils/binutils-2.21/gas/configure.tgt
rename to gas/configure.tgt

diff --git a/binutils/binutils-2.21/gas/debug.c b/gas/debug.c
similarity index 100%
rename from binutils/binutils-2.21/gas/debug.c
rename to gas/debug.c

diff --git a/binutils/binutils-2.21/gas/dep-in.sed b/gas/dep-in.sed
similarity index 100%
rename from binutils/binutils-2.21/gas/dep-in.sed
rename to gas/dep-in.sed

diff --git a/binutils/binutils-2.21/gas/depend.c b/gas/depend.c
similarity index 100%
rename from binutils/binutils-2.21/gas/depend.c
rename to gas/depend.c

diff --git a/binutils/binutils-2.21/gas/doc/Makefile.am b/gas/doc/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/Makefile.am
rename to gas/doc/Makefile.am

diff --git a/binutils/binutils-2.21/gas/doc/Makefile.in b/gas/doc/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/Makefile.in
rename to gas/doc/Makefile.in

diff --git a/binutils/binutils-2.21/gas/doc/all.texi b/gas/doc/all.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/all.texi
rename to gas/doc/all.texi

diff --git a/binutils/binutils-2.21/gas/doc/as.texinfo b/gas/doc/as.texinfo
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/as.texinfo
rename to gas/doc/as.texinfo

diff --git a/binutils/binutils-2.21/gas/doc/asconfig.texi b/gas/doc/asconfig.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/asconfig.texi
rename to gas/doc/asconfig.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-alpha.texi b/gas/doc/c-alpha.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-alpha.texi
rename to gas/doc/c-alpha.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-arc.texi b/gas/doc/c-arc.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-arc.texi
rename to gas/doc/c-arc.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-arm.texi
rename to gas/doc/c-arm.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-avr.texi b/gas/doc/c-avr.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-avr.texi
rename to gas/doc/c-avr.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-bfin.texi b/gas/doc/c-bfin.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-bfin.texi
rename to gas/doc/c-bfin.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-cr16.texi b/gas/doc/c-cr16.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-cr16.texi
rename to gas/doc/c-cr16.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-cris.texi b/gas/doc/c-cris.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-cris.texi
rename to gas/doc/c-cris.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-d10v.texi b/gas/doc/c-d10v.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-d10v.texi
rename to gas/doc/c-d10v.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-d30v.texi b/gas/doc/c-d30v.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-d30v.texi
rename to gas/doc/c-d30v.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-h8300.texi b/gas/doc/c-h8300.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-h8300.texi
rename to gas/doc/c-h8300.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-hppa.texi b/gas/doc/c-hppa.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-hppa.texi
rename to gas/doc/c-hppa.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-i370.texi b/gas/doc/c-i370.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-i370.texi
rename to gas/doc/c-i370.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-i386.texi b/gas/doc/c-i386.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-i386.texi
rename to gas/doc/c-i386.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-i860.texi b/gas/doc/c-i860.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-i860.texi
rename to gas/doc/c-i860.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-i960.texi b/gas/doc/c-i960.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-i960.texi
rename to gas/doc/c-i960.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-ia64.texi b/gas/doc/c-ia64.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-ia64.texi
rename to gas/doc/c-ia64.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-ip2k.texi b/gas/doc/c-ip2k.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-ip2k.texi
rename to gas/doc/c-ip2k.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-lm32.texi b/gas/doc/c-lm32.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-lm32.texi
rename to gas/doc/c-lm32.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-m32c.texi b/gas/doc/c-m32c.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-m32c.texi
rename to gas/doc/c-m32c.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-m32r.texi b/gas/doc/c-m32r.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-m32r.texi
rename to gas/doc/c-m32r.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-m68hc11.texi b/gas/doc/c-m68hc11.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-m68hc11.texi
rename to gas/doc/c-m68hc11.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-m68k.texi b/gas/doc/c-m68k.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-m68k.texi
rename to gas/doc/c-m68k.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-microblaze.texi b/gas/doc/c-microblaze.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-microblaze.texi
rename to gas/doc/c-microblaze.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-mips.texi b/gas/doc/c-mips.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-mips.texi
rename to gas/doc/c-mips.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-mmix.texi b/gas/doc/c-mmix.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-mmix.texi
rename to gas/doc/c-mmix.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-msp430.texi b/gas/doc/c-msp430.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-msp430.texi
rename to gas/doc/c-msp430.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-mt.texi b/gas/doc/c-mt.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-mt.texi
rename to gas/doc/c-mt.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-ns32k.texi b/gas/doc/c-ns32k.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-ns32k.texi
rename to gas/doc/c-ns32k.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-pdp11.texi b/gas/doc/c-pdp11.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-pdp11.texi
rename to gas/doc/c-pdp11.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-pj.texi b/gas/doc/c-pj.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-pj.texi
rename to gas/doc/c-pj.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-ppc.texi b/gas/doc/c-ppc.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-ppc.texi
rename to gas/doc/c-ppc.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-rx.texi b/gas/doc/c-rx.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-rx.texi
rename to gas/doc/c-rx.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-s390.texi b/gas/doc/c-s390.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-s390.texi
rename to gas/doc/c-s390.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-score.texi b/gas/doc/c-score.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-score.texi
rename to gas/doc/c-score.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-sh.texi b/gas/doc/c-sh.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-sh.texi
rename to gas/doc/c-sh.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-sh64.texi b/gas/doc/c-sh64.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-sh64.texi
rename to gas/doc/c-sh64.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-sparc.texi b/gas/doc/c-sparc.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-sparc.texi
rename to gas/doc/c-sparc.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-tic54x.texi b/gas/doc/c-tic54x.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-tic54x.texi
rename to gas/doc/c-tic54x.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-tic6x.texi b/gas/doc/c-tic6x.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-tic6x.texi
rename to gas/doc/c-tic6x.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-v850.texi b/gas/doc/c-v850.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-v850.texi
rename to gas/doc/c-v850.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-vax.texi b/gas/doc/c-vax.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-vax.texi
rename to gas/doc/c-vax.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-xc16x.texi b/gas/doc/c-xc16x.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-xc16x.texi
rename to gas/doc/c-xc16x.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-xtensa.texi b/gas/doc/c-xtensa.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-xtensa.texi
rename to gas/doc/c-xtensa.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-z80.texi b/gas/doc/c-z80.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-z80.texi
rename to gas/doc/c-z80.texi

diff --git a/binutils/binutils-2.21/gas/doc/c-z8k.texi b/gas/doc/c-z8k.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-z8k.texi
rename to gas/doc/c-z8k.texi

diff --git a/binutils/binutils-2.21/gas/doc/fdl.texi b/gas/doc/fdl.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/fdl.texi
rename to gas/doc/fdl.texi

diff --git a/binutils/binutils-2.21/gas/doc/h8.texi b/gas/doc/h8.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/h8.texi
rename to gas/doc/h8.texi

diff --git a/binutils/binutils-2.21/gas/doc/internals.texi b/gas/doc/internals.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/internals.texi
rename to gas/doc/internals.texi

diff --git a/binutils/binutils-2.21/gas/dw2gencfi.c b/gas/dw2gencfi.c
similarity index 100%
rename from binutils/binutils-2.21/gas/dw2gencfi.c
rename to gas/dw2gencfi.c

diff --git a/binutils/binutils-2.21/gas/dw2gencfi.h b/gas/dw2gencfi.h
similarity index 100%
rename from binutils/binutils-2.21/gas/dw2gencfi.h
rename to gas/dw2gencfi.h

diff --git a/binutils/binutils-2.21/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
similarity index 100%
rename from binutils/binutils-2.21/gas/dwarf2dbg.c
rename to gas/dwarf2dbg.c

diff --git a/binutils/binutils-2.21/gas/dwarf2dbg.h b/gas/dwarf2dbg.h
similarity index 100%
rename from binutils/binutils-2.21/gas/dwarf2dbg.h
rename to gas/dwarf2dbg.h

diff --git a/binutils/binutils-2.21/gas/ecoff.c b/gas/ecoff.c
similarity index 100%
rename from binutils/binutils-2.21/gas/ecoff.c
rename to gas/ecoff.c

diff --git a/binutils/binutils-2.21/gas/ecoff.h b/gas/ecoff.h
similarity index 100%
rename from binutils/binutils-2.21/gas/ecoff.h
rename to gas/ecoff.h

diff --git a/binutils/binutils-2.21/gas/ehopt.c b/gas/ehopt.c
similarity index 100%
rename from binutils/binutils-2.21/gas/ehopt.c
rename to gas/ehopt.c

diff --git a/binutils/binutils-2.21/gas/emul-target.h b/gas/emul-target.h
similarity index 100%
rename from binutils/binutils-2.21/gas/emul-target.h
rename to gas/emul-target.h

diff --git a/binutils/binutils-2.21/gas/emul.h b/gas/emul.h
similarity index 100%
rename from binutils/binutils-2.21/gas/emul.h
rename to gas/emul.h

diff --git a/binutils/binutils-2.21/gas/expr.c b/gas/expr.c
similarity index 100%
rename from binutils/binutils-2.21/gas/expr.c
rename to gas/expr.c

diff --git a/binutils/binutils-2.21/gas/expr.h b/gas/expr.h
similarity index 100%
rename from binutils/binutils-2.21/gas/expr.h
rename to gas/expr.h

diff --git a/binutils/binutils-2.21/gas/flonum-copy.c b/gas/flonum-copy.c
similarity index 100%
rename from binutils/binutils-2.21/gas/flonum-copy.c
rename to gas/flonum-copy.c

diff --git a/binutils/binutils-2.21/gas/flonum-konst.c b/gas/flonum-konst.c
similarity index 100%
rename from binutils/binutils-2.21/gas/flonum-konst.c
rename to gas/flonum-konst.c

diff --git a/binutils/binutils-2.21/gas/flonum-mult.c b/gas/flonum-mult.c
similarity index 100%
rename from binutils/binutils-2.21/gas/flonum-mult.c
rename to gas/flonum-mult.c

diff --git a/binutils/binutils-2.21/gas/flonum.h b/gas/flonum.h
similarity index 100%
rename from binutils/binutils-2.21/gas/flonum.h
rename to gas/flonum.h

diff --git a/binutils/binutils-2.21/gas/frags.c b/gas/frags.c
similarity index 100%
rename from binutils/binutils-2.21/gas/frags.c
rename to gas/frags.c

diff --git a/binutils/binutils-2.21/gas/frags.h b/gas/frags.h
similarity index 100%
rename from binutils/binutils-2.21/gas/frags.h
rename to gas/frags.h

diff --git a/binutils/binutils-2.21/gas/gdbinit.in b/gas/gdbinit.in
similarity index 100%
rename from binutils/binutils-2.21/gas/gdbinit.in
rename to gas/gdbinit.in

diff --git a/binutils/binutils-2.21/gas/hash.c b/gas/hash.c
similarity index 100%
rename from binutils/binutils-2.21/gas/hash.c
rename to gas/hash.c

diff --git a/binutils/binutils-2.21/gas/hash.h b/gas/hash.h
similarity index 100%
rename from binutils/binutils-2.21/gas/hash.h
rename to gas/hash.h

diff --git a/binutils/binutils-2.21/gas/input-file.c b/gas/input-file.c
similarity index 100%
rename from binutils/binutils-2.21/gas/input-file.c
rename to gas/input-file.c

diff --git a/binutils/binutils-2.21/gas/input-file.h b/gas/input-file.h
similarity index 100%
rename from binutils/binutils-2.21/gas/input-file.h
rename to gas/input-file.h

diff --git a/binutils/binutils-2.21/gas/input-scrub.c b/gas/input-scrub.c
similarity index 100%
rename from binutils/binutils-2.21/gas/input-scrub.c
rename to gas/input-scrub.c

diff --git a/binutils/binutils-2.21/gas/itbl-lex.c b/gas/itbl-lex.c
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-lex.c
rename to gas/itbl-lex.c

diff --git a/binutils/binutils-2.21/gas/itbl-lex.h b/gas/itbl-lex.h
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-lex.h
rename to gas/itbl-lex.h

diff --git a/binutils/binutils-2.21/gas/itbl-lex.l b/gas/itbl-lex.l
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-lex.l
rename to gas/itbl-lex.l

diff --git a/binutils/binutils-2.21/gas/itbl-ops.c b/gas/itbl-ops.c
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-ops.c
rename to gas/itbl-ops.c

diff --git a/binutils/binutils-2.21/gas/itbl-ops.h b/gas/itbl-ops.h
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-ops.h
rename to gas/itbl-ops.h

diff --git a/binutils/binutils-2.21/gas/itbl-parse.c b/gas/itbl-parse.c
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-parse.c
rename to gas/itbl-parse.c

diff --git a/binutils/binutils-2.21/gas/itbl-parse.h b/gas/itbl-parse.h
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-parse.h
rename to gas/itbl-parse.h

diff --git a/binutils/binutils-2.21/gas/itbl-parse.y b/gas/itbl-parse.y
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-parse.y
rename to gas/itbl-parse.y

diff --git a/binutils/binutils-2.21/gas/listing.c b/gas/listing.c
similarity index 100%
rename from binutils/binutils-2.21/gas/listing.c
rename to gas/listing.c

diff --git a/binutils/binutils-2.21/gas/listing.h b/gas/listing.h
similarity index 100%
rename from binutils/binutils-2.21/gas/listing.h
rename to gas/listing.h

diff --git a/binutils/binutils-2.21/gas/literal.c b/gas/literal.c
similarity index 100%
rename from binutils/binutils-2.21/gas/literal.c
rename to gas/literal.c

diff --git a/binutils/binutils-2.21/gas/m68k-parse.c b/gas/m68k-parse.c
similarity index 100%
rename from binutils/binutils-2.21/gas/m68k-parse.c
rename to gas/m68k-parse.c

diff --git a/binutils/binutils-2.21/gas/macro.c b/gas/macro.c
similarity index 100%
rename from binutils/binutils-2.21/gas/macro.c
rename to gas/macro.c

diff --git a/binutils/binutils-2.21/gas/macro.h b/gas/macro.h
similarity index 100%
rename from binutils/binutils-2.21/gas/macro.h
rename to gas/macro.h

diff --git a/binutils/binutils-2.21/gas/makefile.vms b/gas/makefile.vms
similarity index 100%
rename from binutils/binutils-2.21/gas/makefile.vms
rename to gas/makefile.vms

diff --git a/binutils/binutils-2.21/gas/messages.c b/gas/messages.c
similarity index 100%
rename from binutils/binutils-2.21/gas/messages.c
rename to gas/messages.c

diff --git a/binutils/binutils-2.21/gas/obj.h b/gas/obj.h
similarity index 100%
rename from binutils/binutils-2.21/gas/obj.h
rename to gas/obj.h

diff --git a/binutils/binutils-2.21/gas/output-file.c b/gas/output-file.c
similarity index 100%
rename from binutils/binutils-2.21/gas/output-file.c
rename to gas/output-file.c

diff --git a/binutils/binutils-2.21/gas/output-file.h b/gas/output-file.h
similarity index 100%
rename from binutils/binutils-2.21/gas/output-file.h
rename to gas/output-file.h

diff --git a/binutils/binutils-2.21/gas/po/Make-in b/gas/po/Make-in
similarity index 100%
rename from binutils/binutils-2.21/gas/po/Make-in
rename to gas/po/Make-in

diff --git a/binutils/binutils-2.21/gas/po/POTFILES.in b/gas/po/POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/gas/po/POTFILES.in
rename to gas/po/POTFILES.in

diff --git a/binutils/binutils-2.21/gas/po/es.gmo b/gas/po/es.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/es.gmo
rename to gas/po/es.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/gas/po/es.po b/gas/po/es.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/es.po
rename to gas/po/es.po

diff --git a/binutils/binutils-2.21/gas/po/fr.gmo b/gas/po/fr.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/fr.gmo
rename to gas/po/fr.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/gas/po/fr.po b/gas/po/fr.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/fr.po
rename to gas/po/fr.po

diff --git a/binutils/binutils-2.21/gas/po/gas.pot b/gas/po/gas.pot
similarity index 100%
rename from binutils/binutils-2.21/gas/po/gas.pot
rename to gas/po/gas.pot

diff --git a/binutils/binutils-2.21/gas/po/id.gmo b/gas/po/id.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/id.gmo
rename to gas/po/id.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/gas/po/id.po b/gas/po/id.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/id.po
rename to gas/po/id.po

diff --git a/binutils/binutils-2.21/gas/po/ru.gmo b/gas/po/ru.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/ru.gmo
rename to gas/po/ru.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/gas/po/ru.po b/gas/po/ru.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/ru.po
rename to gas/po/ru.po

diff --git a/binutils/binutils-2.21/gas/po/rw.gmo b/gas/po/rw.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/rw.gmo
rename to gas/po/rw.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/gas/po/rw.po b/gas/po/rw.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/rw.po
rename to gas/po/rw.po

diff --git a/binutils/binutils-2.21/gas/po/tr.gmo b/gas/po/tr.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/tr.gmo
rename to gas/po/tr.gmo
Binary files differ

diff --git a/binutils/binutils-2.21/gas/po/tr.po b/gas/po/tr.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/tr.po
rename to gas/po/tr.po

diff --git a/binutils/binutils-2.21/gas/read.c b/gas/read.c
similarity index 100%
rename from binutils/binutils-2.21/gas/read.c
rename to gas/read.c

diff --git a/binutils/binutils-2.21/gas/read.h b/gas/read.h
similarity index 100%
rename from binutils/binutils-2.21/gas/read.h
rename to gas/read.h

diff --git a/binutils/binutils-2.21/gas/remap.c b/gas/remap.c
similarity index 100%
rename from binutils/binutils-2.21/gas/remap.c
rename to gas/remap.c

diff --git a/binutils/binutils-2.21/gas/rx-parse.c b/gas/rx-parse.c
similarity index 100%
rename from binutils/binutils-2.21/gas/rx-parse.c
rename to gas/rx-parse.c

diff --git a/binutils/binutils-2.21/gas/rx-parse.h b/gas/rx-parse.h
similarity index 100%
rename from binutils/binutils-2.21/gas/rx-parse.h
rename to gas/rx-parse.h

diff --git a/binutils/binutils-2.21/gas/sb.c b/gas/sb.c
similarity index 100%
rename from binutils/binutils-2.21/gas/sb.c
rename to gas/sb.c

diff --git a/binutils/binutils-2.21/gas/sb.h b/gas/sb.h
similarity index 100%
rename from binutils/binutils-2.21/gas/sb.h
rename to gas/sb.h

diff --git a/binutils/binutils-2.21/gas/stabs.c b/gas/stabs.c
similarity index 100%
rename from binutils/binutils-2.21/gas/stabs.c
rename to gas/stabs.c

diff --git a/binutils/binutils-2.21/gas/stamp-h.in b/gas/stamp-h.in
similarity index 100%
rename from binutils/binutils-2.21/gas/stamp-h.in
rename to gas/stamp-h.in

diff --git a/binutils/binutils-2.21/gas/struc-symbol.h b/gas/struc-symbol.h
similarity index 100%
rename from binutils/binutils-2.21/gas/struc-symbol.h
rename to gas/struc-symbol.h

diff --git a/binutils/binutils-2.21/gas/subsegs.c b/gas/subsegs.c
similarity index 100%
rename from binutils/binutils-2.21/gas/subsegs.c
rename to gas/subsegs.c

diff --git a/binutils/binutils-2.21/gas/subsegs.h b/gas/subsegs.h
similarity index 100%
rename from binutils/binutils-2.21/gas/subsegs.h
rename to gas/subsegs.h

diff --git a/binutils/binutils-2.21/gas/symbols.c b/gas/symbols.c
similarity index 100%
rename from binutils/binutils-2.21/gas/symbols.c
rename to gas/symbols.c

diff --git a/binutils/binutils-2.21/gas/symbols.h b/gas/symbols.h
similarity index 100%
rename from binutils/binutils-2.21/gas/symbols.h
rename to gas/symbols.h

diff --git a/binutils/binutils-2.21/gas/tc.h b/gas/tc.h
similarity index 100%
rename from binutils/binutils-2.21/gas/tc.h
rename to gas/tc.h

diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog
rename to gas/testsuite/ChangeLog

diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2004 b/gas/testsuite/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2004
rename to gas/testsuite/ChangeLog-2004

diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2005 b/gas/testsuite/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2005
rename to gas/testsuite/ChangeLog-2005

diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2006 b/gas/testsuite/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2006
rename to gas/testsuite/ChangeLog-2006

diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2007 b/gas/testsuite/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2007
rename to gas/testsuite/ChangeLog-2007

diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2008 b/gas/testsuite/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2008
rename to gas/testsuite/ChangeLog-2008

diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2009 b/gas/testsuite/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2009
rename to gas/testsuite/ChangeLog-2009

diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-9303 b/gas/testsuite/ChangeLog-9303
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-9303
rename to gas/testsuite/ChangeLog-9303

diff --git a/binutils/binutils-2.21/gas/testsuite/config/default.exp b/gas/testsuite/config/default.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/config/default.exp
rename to gas/testsuite/config/default.exp

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/align.d b/gas/testsuite/gas/all/align.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/align.d
rename to gas/testsuite/gas/all/align.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/align.s b/gas/testsuite/gas/all/align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/align.s
rename to gas/testsuite/gas/all/align.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/align2.d b/gas/testsuite/gas/all/align2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/align2.d
rename to gas/testsuite/gas/all/align2.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/align2.s b/gas/testsuite/gas/all/align2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/align2.s
rename to gas/testsuite/gas/all/align2.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/altmac2.d b/gas/testsuite/gas/all/altmac2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/altmac2.d
rename to gas/testsuite/gas/all/altmac2.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/altmac2.s b/gas/testsuite/gas/all/altmac2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/altmac2.s
rename to gas/testsuite/gas/all/altmac2.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/altmacro.d b/gas/testsuite/gas/all/altmacro.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/altmacro.d
rename to gas/testsuite/gas/all/altmacro.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/altmacro.s b/gas/testsuite/gas/all/altmacro.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/altmacro.s
rename to gas/testsuite/gas/all/altmacro.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/assign-bad.s b/gas/testsuite/gas/all/assign-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/assign-bad.s
rename to gas/testsuite/gas/all/assign-bad.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/assign-ok.s b/gas/testsuite/gas/all/assign-ok.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/assign-ok.s
rename to gas/testsuite/gas/all/assign-ok.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/assign.d b/gas/testsuite/gas/all/assign.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/assign.d
rename to gas/testsuite/gas/all/assign.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/assign.s b/gas/testsuite/gas/all/assign.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/assign.s
rename to gas/testsuite/gas/all/assign.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/byte.d b/gas/testsuite/gas/all/byte.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/byte.d
rename to gas/testsuite/gas/all/byte.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/byte.l b/gas/testsuite/gas/all/byte.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/byte.l
rename to gas/testsuite/gas/all/byte.l

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/byte.s b/gas/testsuite/gas/all/byte.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/byte.s
rename to gas/testsuite/gas/all/byte.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/cofftag.d b/gas/testsuite/gas/all/cofftag.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/cofftag.d
rename to gas/testsuite/gas/all/cofftag.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/cofftag.s b/gas/testsuite/gas/all/cofftag.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/cofftag.s
rename to gas/testsuite/gas/all/cofftag.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/comment.s b/gas/testsuite/gas/all/comment.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/comment.s
rename to gas/testsuite/gas/all/comment.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/cond.l b/gas/testsuite/gas/all/cond.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/cond.l
rename to gas/testsuite/gas/all/cond.l

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/cond.s b/gas/testsuite/gas/all/cond.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/cond.s
rename to gas/testsuite/gas/all/cond.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/diff1.s b/gas/testsuite/gas/all/diff1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/diff1.s
rename to gas/testsuite/gas/all/diff1.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/equ-bad.s b/gas/testsuite/gas/all/equ-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/equ-bad.s
rename to gas/testsuite/gas/all/equ-bad.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/equ-ok.s b/gas/testsuite/gas/all/equ-ok.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/equ-ok.s
rename to gas/testsuite/gas/all/equ-ok.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/equiv1.s b/gas/testsuite/gas/all/equiv1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/equiv1.s
rename to gas/testsuite/gas/all/equiv1.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/equiv2.s b/gas/testsuite/gas/all/equiv2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/equiv2.s
rename to gas/testsuite/gas/all/equiv2.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/eqv-bad.s b/gas/testsuite/gas/all/eqv-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/eqv-bad.s
rename to gas/testsuite/gas/all/eqv-bad.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/eqv-ok.s b/gas/testsuite/gas/all/eqv-ok.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/eqv-ok.s
rename to gas/testsuite/gas/all/eqv-ok.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/err-1.s b/gas/testsuite/gas/all/err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/err-1.s
rename to gas/testsuite/gas/all/err-1.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/eval.d b/gas/testsuite/gas/all/eval.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/eval.d
rename to gas/testsuite/gas/all/eval.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/eval.s b/gas/testsuite/gas/all/eval.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/eval.s
rename to gas/testsuite/gas/all/eval.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/excl.s b/gas/testsuite/gas/all/excl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/excl.s
rename to gas/testsuite/gas/all/excl.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/fastcall.s b/gas/testsuite/gas/all/fastcall.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/fastcall.s
rename to gas/testsuite/gas/all/fastcall.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/float.s b/gas/testsuite/gas/all/float.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/float.s
rename to gas/testsuite/gas/all/float.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/forward.d b/gas/testsuite/gas/all/forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/forward.d
rename to gas/testsuite/gas/all/forward.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/forward.s b/gas/testsuite/gas/all/forward.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/forward.s
rename to gas/testsuite/gas/all/forward.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/fwdexp.d b/gas/testsuite/gas/all/fwdexp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/fwdexp.d
rename to gas/testsuite/gas/all/fwdexp.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/fwdexp.s b/gas/testsuite/gas/all/fwdexp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/fwdexp.s
rename to gas/testsuite/gas/all/fwdexp.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/gas.exp
rename to gas/testsuite/gas/all/gas.exp

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/incbin.d b/gas/testsuite/gas/all/incbin.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/incbin.d
rename to gas/testsuite/gas/all/incbin.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/incbin.dat b/gas/testsuite/gas/all/incbin.dat
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/incbin.dat
rename to gas/testsuite/gas/all/incbin.dat

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/incbin.s b/gas/testsuite/gas/all/incbin.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/incbin.s
rename to gas/testsuite/gas/all/incbin.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/itbl b/gas/testsuite/gas/all/itbl
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/itbl
rename to gas/testsuite/gas/all/itbl

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/itbl-test.c b/gas/testsuite/gas/all/itbl-test.c
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/itbl-test.c
rename to gas/testsuite/gas/all/itbl-test.c

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/itbl.s b/gas/testsuite/gas/all/itbl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/itbl.s
rename to gas/testsuite/gas/all/itbl.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/octa.d b/gas/testsuite/gas/all/octa.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/octa.d
rename to gas/testsuite/gas/all/octa.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/octa.s b/gas/testsuite/gas/all/octa.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/octa.s
rename to gas/testsuite/gas/all/octa.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/p1480.s b/gas/testsuite/gas/all/p1480.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/p1480.s
rename to gas/testsuite/gas/all/p1480.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/p2425.s b/gas/testsuite/gas/all/p2425.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/p2425.s
rename to gas/testsuite/gas/all/p2425.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/quad.d b/gas/testsuite/gas/all/quad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/quad.d
rename to gas/testsuite/gas/all/quad.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/quad.s b/gas/testsuite/gas/all/quad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/quad.s
rename to gas/testsuite/gas/all/quad.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef.d b/gas/testsuite/gas/all/redef.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef.d
rename to gas/testsuite/gas/all/redef.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef.s b/gas/testsuite/gas/all/redef.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef.s
rename to gas/testsuite/gas/all/redef.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef2.d b/gas/testsuite/gas/all/redef2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef2.d
rename to gas/testsuite/gas/all/redef2.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef2.s b/gas/testsuite/gas/all/redef2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef2.s
rename to gas/testsuite/gas/all/redef2.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef3.d b/gas/testsuite/gas/all/redef3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef3.d
rename to gas/testsuite/gas/all/redef3.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef3.s b/gas/testsuite/gas/all/redef3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef3.s
rename to gas/testsuite/gas/all/redef3.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef4.s b/gas/testsuite/gas/all/redef4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef4.s
rename to gas/testsuite/gas/all/redef4.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef5.s b/gas/testsuite/gas/all/redef5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef5.s
rename to gas/testsuite/gas/all/redef5.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/relax.d b/gas/testsuite/gas/all/relax.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/relax.d
rename to gas/testsuite/gas/all/relax.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/relax.s b/gas/testsuite/gas/all/relax.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/relax.s
rename to gas/testsuite/gas/all/relax.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/sleb128.d b/gas/testsuite/gas/all/sleb128.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/sleb128.d
rename to gas/testsuite/gas/all/sleb128.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/sleb128.s b/gas/testsuite/gas/all/sleb128.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/sleb128.s
rename to gas/testsuite/gas/all/sleb128.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/string.d b/gas/testsuite/gas/all/string.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/string.d
rename to gas/testsuite/gas/all/string.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/string.s b/gas/testsuite/gas/all/string.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/string.s
rename to gas/testsuite/gas/all/string.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/struct.d b/gas/testsuite/gas/all/struct.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/struct.d
rename to gas/testsuite/gas/all/struct.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/struct.s b/gas/testsuite/gas/all/struct.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/struct.s
rename to gas/testsuite/gas/all/struct.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/test-example.c b/gas/testsuite/gas/all/test-example.c
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/test-example.c
rename to gas/testsuite/gas/all/test-example.c

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/test-gen.c b/gas/testsuite/gas/all/test-gen.c
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/test-gen.c
rename to gas/testsuite/gas/all/test-gen.c

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/warn-1.s b/gas/testsuite/gas/all/warn-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/warn-1.s
rename to gas/testsuite/gas/all/warn-1.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1.d b/gas/testsuite/gas/all/weakref1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1.d
rename to gas/testsuite/gas/all/weakref1.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1.s b/gas/testsuite/gas/all/weakref1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1.s
rename to gas/testsuite/gas/all/weakref1.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1g.d b/gas/testsuite/gas/all/weakref1g.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1g.d
rename to gas/testsuite/gas/all/weakref1g.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1l.d b/gas/testsuite/gas/all/weakref1l.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1l.d
rename to gas/testsuite/gas/all/weakref1l.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1u.d b/gas/testsuite/gas/all/weakref1u.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1u.d
rename to gas/testsuite/gas/all/weakref1u.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1w.d b/gas/testsuite/gas/all/weakref1w.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1w.d
rename to gas/testsuite/gas/all/weakref1w.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref2.s b/gas/testsuite/gas/all/weakref2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref2.s
rename to gas/testsuite/gas/all/weakref2.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref3.s b/gas/testsuite/gas/all/weakref3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref3.s
rename to gas/testsuite/gas/all/weakref3.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref4.s b/gas/testsuite/gas/all/weakref4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref4.s
rename to gas/testsuite/gas/all/weakref4.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/x930509.s b/gas/testsuite/gas/all/x930509.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/x930509.s
rename to gas/testsuite/gas/all/x930509.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/alpha.exp b/gas/testsuite/gas/alpha/alpha.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/alpha.exp
rename to gas/testsuite/gas/alpha/alpha.exp

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-1.d b/gas/testsuite/gas/alpha/elf-reloc-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-1.d
rename to gas/testsuite/gas/alpha/elf-reloc-1.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-1.s b/gas/testsuite/gas/alpha/elf-reloc-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-1.s
rename to gas/testsuite/gas/alpha/elf-reloc-1.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-2.l b/gas/testsuite/gas/alpha/elf-reloc-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-2.l
rename to gas/testsuite/gas/alpha/elf-reloc-2.l

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-2.s b/gas/testsuite/gas/alpha/elf-reloc-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-2.s
rename to gas/testsuite/gas/alpha/elf-reloc-2.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-3.l b/gas/testsuite/gas/alpha/elf-reloc-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-3.l
rename to gas/testsuite/gas/alpha/elf-reloc-3.l

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-3.s b/gas/testsuite/gas/alpha/elf-reloc-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-3.s
rename to gas/testsuite/gas/alpha/elf-reloc-3.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-4.d b/gas/testsuite/gas/alpha/elf-reloc-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-4.d
rename to gas/testsuite/gas/alpha/elf-reloc-4.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-4.s b/gas/testsuite/gas/alpha/elf-reloc-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-4.s
rename to gas/testsuite/gas/alpha/elf-reloc-4.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-5.d b/gas/testsuite/gas/alpha/elf-reloc-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-5.d
rename to gas/testsuite/gas/alpha/elf-reloc-5.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-5.s b/gas/testsuite/gas/alpha/elf-reloc-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-5.s
rename to gas/testsuite/gas/alpha/elf-reloc-5.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-6.l b/gas/testsuite/gas/alpha/elf-reloc-6.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-6.l
rename to gas/testsuite/gas/alpha/elf-reloc-6.l

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-6.s b/gas/testsuite/gas/alpha/elf-reloc-6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-6.s
rename to gas/testsuite/gas/alpha/elf-reloc-6.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-7.d b/gas/testsuite/gas/alpha/elf-reloc-7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-7.d
rename to gas/testsuite/gas/alpha/elf-reloc-7.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-7.s b/gas/testsuite/gas/alpha/elf-reloc-7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-7.s
rename to gas/testsuite/gas/alpha/elf-reloc-7.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-8.d b/gas/testsuite/gas/alpha/elf-reloc-8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-8.d
rename to gas/testsuite/gas/alpha/elf-reloc-8.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-8.s b/gas/testsuite/gas/alpha/elf-reloc-8.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-8.s
rename to gas/testsuite/gas/alpha/elf-reloc-8.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-1.d b/gas/testsuite/gas/alpha/elf-tls-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-1.d
rename to gas/testsuite/gas/alpha/elf-tls-1.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-1.s b/gas/testsuite/gas/alpha/elf-tls-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-1.s
rename to gas/testsuite/gas/alpha/elf-tls-1.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-2.l b/gas/testsuite/gas/alpha/elf-tls-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-2.l
rename to gas/testsuite/gas/alpha/elf-tls-2.l

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-2.s b/gas/testsuite/gas/alpha/elf-tls-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-2.s
rename to gas/testsuite/gas/alpha/elf-tls-2.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-3.l b/gas/testsuite/gas/alpha/elf-tls-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-3.l
rename to gas/testsuite/gas/alpha/elf-tls-3.l

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-3.s b/gas/testsuite/gas/alpha/elf-tls-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-3.s
rename to gas/testsuite/gas/alpha/elf-tls-3.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-1.d b/gas/testsuite/gas/alpha/elf-usepv-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-1.d
rename to gas/testsuite/gas/alpha/elf-usepv-1.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-1.s b/gas/testsuite/gas/alpha/elf-usepv-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-1.s
rename to gas/testsuite/gas/alpha/elf-usepv-1.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-2.l b/gas/testsuite/gas/alpha/elf-usepv-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-2.l
rename to gas/testsuite/gas/alpha/elf-usepv-2.l

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-2.s b/gas/testsuite/gas/alpha/elf-usepv-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-2.s
rename to gas/testsuite/gas/alpha/elf-usepv-2.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/fp.d b/gas/testsuite/gas/alpha/fp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/fp.d
rename to gas/testsuite/gas/alpha/fp.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/fp.s b/gas/testsuite/gas/alpha/fp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/fp.s
rename to gas/testsuite/gas/alpha/fp.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/unop.d b/gas/testsuite/gas/alpha/unop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/unop.d
rename to gas/testsuite/gas/alpha/unop.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/unop.s b/gas/testsuite/gas/alpha/unop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/unop.s
rename to gas/testsuite/gas/alpha/unop.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/adc.d b/gas/testsuite/gas/arc/adc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/adc.d
rename to gas/testsuite/gas/arc/adc.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/adc.s b/gas/testsuite/gas/arc/adc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/adc.s
rename to gas/testsuite/gas/arc/adc.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/add.d b/gas/testsuite/gas/arc/add.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/add.d
rename to gas/testsuite/gas/arc/add.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/add.s b/gas/testsuite/gas/arc/add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/add.s
rename to gas/testsuite/gas/arc/add.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/alias.d b/gas/testsuite/gas/arc/alias.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/alias.d
rename to gas/testsuite/gas/arc/alias.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/alias.s b/gas/testsuite/gas/arc/alias.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/alias.s
rename to gas/testsuite/gas/arc/alias.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/and.d b/gas/testsuite/gas/arc/and.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/and.d
rename to gas/testsuite/gas/arc/and.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/and.s b/gas/testsuite/gas/arc/and.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/and.s
rename to gas/testsuite/gas/arc/and.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/arc.exp b/gas/testsuite/gas/arc/arc.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/arc.exp
rename to gas/testsuite/gas/arc/arc.exp

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/asl.d b/gas/testsuite/gas/arc/asl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/asl.d
rename to gas/testsuite/gas/arc/asl.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/asl.s b/gas/testsuite/gas/arc/asl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/asl.s
rename to gas/testsuite/gas/arc/asl.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/asr.d b/gas/testsuite/gas/arc/asr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/asr.d
rename to gas/testsuite/gas/arc/asr.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/asr.s b/gas/testsuite/gas/arc/asr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/asr.s
rename to gas/testsuite/gas/arc/asr.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/b.d b/gas/testsuite/gas/arc/b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/b.d
rename to gas/testsuite/gas/arc/b.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/b.s b/gas/testsuite/gas/arc/b.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/b.s
rename to gas/testsuite/gas/arc/b.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/bic.d b/gas/testsuite/gas/arc/bic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/bic.d
rename to gas/testsuite/gas/arc/bic.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/bic.s b/gas/testsuite/gas/arc/bic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/bic.s
rename to gas/testsuite/gas/arc/bic.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/bl.d b/gas/testsuite/gas/arc/bl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/bl.d
rename to gas/testsuite/gas/arc/bl.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/bl.s b/gas/testsuite/gas/arc/bl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/bl.s
rename to gas/testsuite/gas/arc/bl.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/branch.d b/gas/testsuite/gas/arc/branch.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/branch.d
rename to gas/testsuite/gas/arc/branch.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/branch.s b/gas/testsuite/gas/arc/branch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/branch.s
rename to gas/testsuite/gas/arc/branch.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/brk.d b/gas/testsuite/gas/arc/brk.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/brk.d
rename to gas/testsuite/gas/arc/brk.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/brk.s b/gas/testsuite/gas/arc/brk.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/brk.s
rename to gas/testsuite/gas/arc/brk.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extb.d b/gas/testsuite/gas/arc/extb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extb.d
rename to gas/testsuite/gas/arc/extb.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extb.s b/gas/testsuite/gas/arc/extb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extb.s
rename to gas/testsuite/gas/arc/extb.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extensions.d b/gas/testsuite/gas/arc/extensions.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extensions.d
rename to gas/testsuite/gas/arc/extensions.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extensions.s b/gas/testsuite/gas/arc/extensions.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extensions.s
rename to gas/testsuite/gas/arc/extensions.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extw.d b/gas/testsuite/gas/arc/extw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extw.d
rename to gas/testsuite/gas/arc/extw.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extw.s b/gas/testsuite/gas/arc/extw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extw.s
rename to gas/testsuite/gas/arc/extw.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/flag.d b/gas/testsuite/gas/arc/flag.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/flag.d
rename to gas/testsuite/gas/arc/flag.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/flag.s b/gas/testsuite/gas/arc/flag.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/flag.s
rename to gas/testsuite/gas/arc/flag.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/insn3.d b/gas/testsuite/gas/arc/insn3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/insn3.d
rename to gas/testsuite/gas/arc/insn3.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/insn3.s b/gas/testsuite/gas/arc/insn3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/insn3.s
rename to gas/testsuite/gas/arc/insn3.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/j.d b/gas/testsuite/gas/arc/j.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/j.d
rename to gas/testsuite/gas/arc/j.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/j.s b/gas/testsuite/gas/arc/j.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/j.s
rename to gas/testsuite/gas/arc/j.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/jl.d b/gas/testsuite/gas/arc/jl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/jl.d
rename to gas/testsuite/gas/arc/jl.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/jl.s b/gas/testsuite/gas/arc/jl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/jl.s
rename to gas/testsuite/gas/arc/jl.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ld.d b/gas/testsuite/gas/arc/ld.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ld.d
rename to gas/testsuite/gas/arc/ld.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ld.s b/gas/testsuite/gas/arc/ld.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ld.s
rename to gas/testsuite/gas/arc/ld.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ld2.d b/gas/testsuite/gas/arc/ld2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ld2.d
rename to gas/testsuite/gas/arc/ld2.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ld2.s b/gas/testsuite/gas/arc/ld2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ld2.s
rename to gas/testsuite/gas/arc/ld2.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/lp.d b/gas/testsuite/gas/arc/lp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/lp.d
rename to gas/testsuite/gas/arc/lp.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/lp.s b/gas/testsuite/gas/arc/lp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/lp.s
rename to gas/testsuite/gas/arc/lp.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/lsr.d b/gas/testsuite/gas/arc/lsr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/lsr.d
rename to gas/testsuite/gas/arc/lsr.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/lsr.s b/gas/testsuite/gas/arc/lsr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/lsr.s
rename to gas/testsuite/gas/arc/lsr.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/math.d b/gas/testsuite/gas/arc/math.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/math.d
rename to gas/testsuite/gas/arc/math.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/math.s b/gas/testsuite/gas/arc/math.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/math.s
rename to gas/testsuite/gas/arc/math.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/mov.d b/gas/testsuite/gas/arc/mov.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/mov.d
rename to gas/testsuite/gas/arc/mov.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/mov.s b/gas/testsuite/gas/arc/mov.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/mov.s
rename to gas/testsuite/gas/arc/mov.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/nop.d b/gas/testsuite/gas/arc/nop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/nop.d
rename to gas/testsuite/gas/arc/nop.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/nop.s b/gas/testsuite/gas/arc/nop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/nop.s
rename to gas/testsuite/gas/arc/nop.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/or.d b/gas/testsuite/gas/arc/or.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/or.d
rename to gas/testsuite/gas/arc/or.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/or.s b/gas/testsuite/gas/arc/or.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/or.s
rename to gas/testsuite/gas/arc/or.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/rlc.d b/gas/testsuite/gas/arc/rlc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/rlc.d
rename to gas/testsuite/gas/arc/rlc.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/rlc.s b/gas/testsuite/gas/arc/rlc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/rlc.s
rename to gas/testsuite/gas/arc/rlc.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ror.d b/gas/testsuite/gas/arc/ror.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ror.d
rename to gas/testsuite/gas/arc/ror.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ror.s b/gas/testsuite/gas/arc/ror.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ror.s
rename to gas/testsuite/gas/arc/ror.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/rrc.d b/gas/testsuite/gas/arc/rrc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/rrc.d
rename to gas/testsuite/gas/arc/rrc.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/rrc.s b/gas/testsuite/gas/arc/rrc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/rrc.s
rename to gas/testsuite/gas/arc/rrc.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sbc.d b/gas/testsuite/gas/arc/sbc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sbc.d
rename to gas/testsuite/gas/arc/sbc.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sbc.s b/gas/testsuite/gas/arc/sbc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sbc.s
rename to gas/testsuite/gas/arc/sbc.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sexb.d b/gas/testsuite/gas/arc/sexb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sexb.d
rename to gas/testsuite/gas/arc/sexb.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sexb.s b/gas/testsuite/gas/arc/sexb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sexb.s
rename to gas/testsuite/gas/arc/sexb.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sexw.d b/gas/testsuite/gas/arc/sexw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sexw.d
rename to gas/testsuite/gas/arc/sexw.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sexw.s b/gas/testsuite/gas/arc/sexw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sexw.s
rename to gas/testsuite/gas/arc/sexw.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sleep.d b/gas/testsuite/gas/arc/sleep.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sleep.d
rename to gas/testsuite/gas/arc/sleep.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sleep.s b/gas/testsuite/gas/arc/sleep.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sleep.s
rename to gas/testsuite/gas/arc/sleep.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sshift.d b/gas/testsuite/gas/arc/sshift.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sshift.d
rename to gas/testsuite/gas/arc/sshift.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sshift.s b/gas/testsuite/gas/arc/sshift.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sshift.s
rename to gas/testsuite/gas/arc/sshift.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/st.d b/gas/testsuite/gas/arc/st.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/st.d
rename to gas/testsuite/gas/arc/st.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/st.s b/gas/testsuite/gas/arc/st.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/st.s
rename to gas/testsuite/gas/arc/st.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sub.d b/gas/testsuite/gas/arc/sub.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sub.d
rename to gas/testsuite/gas/arc/sub.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sub.s b/gas/testsuite/gas/arc/sub.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sub.s
rename to gas/testsuite/gas/arc/sub.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/swi.d b/gas/testsuite/gas/arc/swi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/swi.d
rename to gas/testsuite/gas/arc/swi.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/swi.s b/gas/testsuite/gas/arc/swi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/swi.s
rename to gas/testsuite/gas/arc/swi.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/warn.exp b/gas/testsuite/gas/arc/warn.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/warn.exp
rename to gas/testsuite/gas/arc/warn.exp

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/warn.s b/gas/testsuite/gas/arc/warn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/warn.s
rename to gas/testsuite/gas/arc/warn.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/xor.d b/gas/testsuite/gas/arc/xor.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/xor.d
rename to gas/testsuite/gas/arc/xor.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/xor.s b/gas/testsuite/gas/arc/xor.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/xor.s
rename to gas/testsuite/gas/arc/xor.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/abs12.d b/gas/testsuite/gas/arm/abs12.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/abs12.d
rename to gas/testsuite/gas/arm/abs12.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/abs12.s b/gas/testsuite/gas/arm/abs12.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/abs12.s
rename to gas/testsuite/gas/arm/abs12.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.d b/gas/testsuite/gas/arm/addsw-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.d
rename to gas/testsuite/gas/arm/addsw-bad.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.l b/gas/testsuite/gas/arm/addsw-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.l
rename to gas/testsuite/gas/arm/addsw-bad.l

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.s b/gas/testsuite/gas/arm/addsw-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.s
rename to gas/testsuite/gas/arm/addsw-bad.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.d b/gas/testsuite/gas/arm/adr-invalid.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.d
rename to gas/testsuite/gas/arm/adr-invalid.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.l b/gas/testsuite/gas/arm/adr-invalid.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.l
rename to gas/testsuite/gas/arm/adr-invalid.l

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.s b/gas/testsuite/gas/arm/adr-invalid.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.s
rename to gas/testsuite/gas/arm/adr-invalid.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/adrl.d b/gas/testsuite/gas/arm/adrl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/adrl.d
rename to gas/testsuite/gas/arm/adrl.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/adrl.s b/gas/testsuite/gas/arm/adrl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/adrl.s
rename to gas/testsuite/gas/arm/adrl.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/align.d b/gas/testsuite/gas/arm/align.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/align.d
rename to gas/testsuite/gas/arm/align.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/align.s b/gas/testsuite/gas/arm/align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/align.s
rename to gas/testsuite/gas/arm/align.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/align64.d b/gas/testsuite/gas/arm/align64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/align64.d
rename to gas/testsuite/gas/arm/align64.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/align64.s b/gas/testsuite/gas/arm/align64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/align64.s
rename to gas/testsuite/gas/arm/align64.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t-eabi.d b/gas/testsuite/gas/arm/arch4t-eabi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t-eabi.d
rename to gas/testsuite/gas/arm/arch4t-eabi.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t.d b/gas/testsuite/gas/arm/arch4t.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t.d
rename to gas/testsuite/gas/arm/arch4t.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t.s b/gas/testsuite/gas/arm/arch4t.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t.s
rename to gas/testsuite/gas/arm/arch4t.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch5tej.d b/gas/testsuite/gas/arm/arch5tej.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch5tej.d
rename to gas/testsuite/gas/arm/arch5tej.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch5tej.s b/gas/testsuite/gas/arm/arch5tej.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch5tej.s
rename to gas/testsuite/gas/arm/arch5tej.s

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch6zk.d b/gas/testsuite/gas/arm/arch6zk.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch6zk.d
rename to gas/testsuite/gas/arm/arch6zk.d

diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch6zk.s b/gas/testsuite/gas/arm/arch6zk.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch6zk.s
rename to gas/testsuite/gas/arm/arch6zk.s