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