diff --git a/contrib/binutils/ChangeLog b/x/binutils/ChangeLog
similarity index 100%
rename from contrib/binutils/ChangeLog
rename to x/binutils/ChangeLog
diff --git a/contrib/binutils/MAINTAINERS b/x/binutils/MAINTAINERS
similarity index 100%
rename from contrib/binutils/MAINTAINERS
rename to x/binutils/MAINTAINERS
diff --git a/contrib/binutils/Makefile.def b/x/binutils/Makefile.def
similarity index 100%
rename from contrib/binutils/Makefile.def
rename to x/binutils/Makefile.def
diff --git a/contrib/binutils/Makefile.in b/x/binutils/Makefile.in
similarity index 100%
rename from contrib/binutils/Makefile.in
rename to x/binutils/Makefile.in
diff --git a/contrib/binutils/Makefile.tpl b/x/binutils/Makefile.tpl
similarity index 100%
rename from contrib/binutils/Makefile.tpl
rename to x/binutils/Makefile.tpl
diff --git a/contrib/binutils/README b/x/binutils/README
similarity index 100%
rename from contrib/binutils/README
rename to x/binutils/README
diff --git a/contrib/binutils/README-maintainer-mode b/x/binutils/README-maintainer-mode
similarity index 100%
rename from contrib/binutils/README-maintainer-mode
rename to x/binutils/README-maintainer-mode
diff --git a/contrib/binutils/bfd/ChangeLog b/x/binutils/bfd/ChangeLog
similarity index 100%
rename from contrib/binutils/bfd/ChangeLog
rename to x/binutils/bfd/ChangeLog
diff --git a/contrib/binutils/bfd/ChangeLog-0001 b/x/binutils/bfd/ChangeLog-0001
similarity index 100%
rename from contrib/binutils/bfd/ChangeLog-0001
rename to x/binutils/bfd/ChangeLog-0001
diff --git a/contrib/binutils/bfd/ChangeLog-0203 b/x/binutils/bfd/ChangeLog-0203
similarity index 100%
rename from contrib/binutils/bfd/ChangeLog-0203
rename to x/binutils/bfd/ChangeLog-0203
diff --git a/contrib/binutils/bfd/ChangeLog-9193 b/x/binutils/bfd/ChangeLog-9193
similarity index 100%
rename from contrib/binutils/bfd/ChangeLog-9193
rename to x/binutils/bfd/ChangeLog-9193
diff --git a/contrib/binutils/bfd/ChangeLog-9495 b/x/binutils/bfd/ChangeLog-9495
similarity index 100%
rename from contrib/binutils/bfd/ChangeLog-9495
rename to x/binutils/bfd/ChangeLog-9495
diff --git a/contrib/binutils/bfd/ChangeLog-9697 b/x/binutils/bfd/ChangeLog-9697
similarity index 100%
rename from contrib/binutils/bfd/ChangeLog-9697
rename to x/binutils/bfd/ChangeLog-9697
diff --git a/contrib/binutils/bfd/ChangeLog-9899 b/x/binutils/bfd/ChangeLog-9899
similarity index 100%
rename from contrib/binutils/bfd/ChangeLog-9899
rename to x/binutils/bfd/ChangeLog-9899
diff --git a/contrib/binutils/bfd/MAINTAINERS b/x/binutils/bfd/MAINTAINERS
similarity index 100%
rename from contrib/binutils/bfd/MAINTAINERS
rename to x/binutils/bfd/MAINTAINERS
diff --git a/contrib/binutils/bfd/Makefile.am b/x/binutils/bfd/Makefile.am
similarity index 100%
rename from contrib/binutils/bfd/Makefile.am
rename to x/binutils/bfd/Makefile.am
diff --git a/contrib/binutils/bfd/Makefile.in b/x/binutils/bfd/Makefile.in
similarity index 100%
rename from contrib/binutils/bfd/Makefile.in
rename to x/binutils/bfd/Makefile.in
diff --git a/contrib/binutils/bfd/PORTING b/x/binutils/bfd/PORTING
similarity index 100%
rename from contrib/binutils/bfd/PORTING
rename to x/binutils/bfd/PORTING
diff --git a/contrib/binutils/bfd/README b/x/binutils/bfd/README
similarity index 100%
rename from contrib/binutils/bfd/README
rename to x/binutils/bfd/README
diff --git a/contrib/binutils/bfd/TODO b/x/binutils/bfd/TODO
similarity index 100%
rename from contrib/binutils/bfd/TODO
rename to x/binutils/bfd/TODO
diff --git a/contrib/binutils/bfd/acinclude.m4 b/x/binutils/bfd/acinclude.m4
similarity index 100%
rename from contrib/binutils/bfd/acinclude.m4
rename to x/binutils/bfd/acinclude.m4
diff --git a/contrib/binutils/bfd/aclocal.m4 b/x/binutils/bfd/aclocal.m4
similarity index 100%
rename from contrib/binutils/bfd/aclocal.m4
rename to x/binutils/bfd/aclocal.m4
diff --git a/contrib/binutils/bfd/aout-arm.c b/x/binutils/bfd/aout-arm.c
similarity index 100%
rename from contrib/binutils/bfd/aout-arm.c
rename to x/binutils/bfd/aout-arm.c
diff --git a/contrib/binutils/bfd/aout-encap.c b/x/binutils/bfd/aout-encap.c
similarity index 100%
rename from contrib/binutils/bfd/aout-encap.c
rename to x/binutils/bfd/aout-encap.c
diff --git a/contrib/binutils/bfd/aout-sparcle.c b/x/binutils/bfd/aout-sparcle.c
similarity index 100%
rename from contrib/binutils/bfd/aout-sparcle.c
rename to x/binutils/bfd/aout-sparcle.c
diff --git a/contrib/binutils/bfd/aout-target.h b/x/binutils/bfd/aout-target.h
similarity index 100%
rename from contrib/binutils/bfd/aout-target.h
rename to x/binutils/bfd/aout-target.h
diff --git a/contrib/binutils/bfd/aout0.c b/x/binutils/bfd/aout0.c
similarity index 100%
rename from contrib/binutils/bfd/aout0.c
rename to x/binutils/bfd/aout0.c
diff --git a/contrib/binutils/bfd/aout32.c b/x/binutils/bfd/aout32.c
similarity index 100%
rename from contrib/binutils/bfd/aout32.c
rename to x/binutils/bfd/aout32.c
diff --git a/contrib/binutils/bfd/aout64.c b/x/binutils/bfd/aout64.c
similarity index 100%
rename from contrib/binutils/bfd/aout64.c
rename to x/binutils/bfd/aout64.c
diff --git a/contrib/binutils/bfd/aoutf1.h b/x/binutils/bfd/aoutf1.h
similarity index 100%
rename from contrib/binutils/bfd/aoutf1.h
rename to x/binutils/bfd/aoutf1.h
diff --git a/contrib/binutils/bfd/aoutx.h b/x/binutils/bfd/aoutx.h
similarity index 100%
rename from contrib/binutils/bfd/aoutx.h
rename to x/binutils/bfd/aoutx.h
diff --git a/contrib/binutils/bfd/archive.c b/x/binutils/bfd/archive.c
similarity index 100%
rename from contrib/binutils/bfd/archive.c
rename to x/binutils/bfd/archive.c
diff --git a/contrib/binutils/bfd/archive64.c b/x/binutils/bfd/archive64.c
similarity index 100%
rename from contrib/binutils/bfd/archive64.c
rename to x/binutils/bfd/archive64.c
diff --git a/contrib/binutils/bfd/archures.c b/x/binutils/bfd/archures.c
similarity index 100%
rename from contrib/binutils/bfd/archures.c
rename to x/binutils/bfd/archures.c
diff --git a/contrib/binutils/bfd/armnetbsd.c b/x/binutils/bfd/armnetbsd.c
similarity index 100%
rename from contrib/binutils/bfd/armnetbsd.c
rename to x/binutils/bfd/armnetbsd.c
diff --git a/contrib/binutils/bfd/bfd-in.h b/x/binutils/bfd/bfd-in.h
similarity index 100%
rename from contrib/binutils/bfd/bfd-in.h
rename to x/binutils/bfd/bfd-in.h
diff --git a/contrib/binutils/bfd/bfd-in2.h b/x/binutils/bfd/bfd-in2.h
similarity index 100%
rename from contrib/binutils/bfd/bfd-in2.h
rename to x/binutils/bfd/bfd-in2.h
diff --git a/contrib/binutils/bfd/bfd.c b/x/binutils/bfd/bfd.c
similarity index 100%
rename from contrib/binutils/bfd/bfd.c
rename to x/binutils/bfd/bfd.c
diff --git a/contrib/binutils/bfd/bfdio.c b/x/binutils/bfd/bfdio.c
similarity index 100%
rename from contrib/binutils/bfd/bfdio.c
rename to x/binutils/bfd/bfdio.c
diff --git a/contrib/binutils/bfd/bfdwin.c b/x/binutils/bfd/bfdwin.c
similarity index 100%
rename from contrib/binutils/bfd/bfdwin.c
rename to x/binutils/bfd/bfdwin.c
diff --git a/contrib/binutils/bfd/binary.c b/x/binutils/bfd/binary.c
similarity index 100%
rename from contrib/binutils/bfd/binary.c
rename to x/binutils/bfd/binary.c
diff --git a/contrib/binutils/bfd/bout.c b/x/binutils/bfd/bout.c
similarity index 100%
rename from contrib/binutils/bfd/bout.c
rename to x/binutils/bfd/bout.c
diff --git a/contrib/binutils/bfd/cache.c b/x/binutils/bfd/cache.c
similarity index 100%
rename from contrib/binutils/bfd/cache.c
rename to x/binutils/bfd/cache.c
diff --git a/contrib/binutils/bfd/coff-alpha.c b/x/binutils/bfd/coff-alpha.c
similarity index 100%
rename from contrib/binutils/bfd/coff-alpha.c
rename to x/binutils/bfd/coff-alpha.c
diff --git a/contrib/binutils/bfd/coff-arm.c b/x/binutils/bfd/coff-arm.c
similarity index 100%
rename from contrib/binutils/bfd/coff-arm.c
rename to x/binutils/bfd/coff-arm.c
diff --git a/contrib/binutils/bfd/coff-aux.c b/x/binutils/bfd/coff-aux.c
similarity index 100%
rename from contrib/binutils/bfd/coff-aux.c
rename to x/binutils/bfd/coff-aux.c
diff --git a/contrib/binutils/bfd/coff-i386.c b/x/binutils/bfd/coff-i386.c
similarity index 100%
rename from contrib/binutils/bfd/coff-i386.c
rename to x/binutils/bfd/coff-i386.c
diff --git a/contrib/binutils/bfd/coff-ia64.c b/x/binutils/bfd/coff-ia64.c
similarity index 100%
rename from contrib/binutils/bfd/coff-ia64.c
rename to x/binutils/bfd/coff-ia64.c
diff --git a/contrib/binutils/bfd/coff-mips.c b/x/binutils/bfd/coff-mips.c
similarity index 100%
rename from contrib/binutils/bfd/coff-mips.c
rename to x/binutils/bfd/coff-mips.c
diff --git a/contrib/binutils/bfd/coff-ppc.c b/x/binutils/bfd/coff-ppc.c
similarity index 100%
rename from contrib/binutils/bfd/coff-ppc.c
rename to x/binutils/bfd/coff-ppc.c
diff --git a/contrib/binutils/bfd/coff-rs6000.c b/x/binutils/bfd/coff-rs6000.c
similarity index 100%
rename from contrib/binutils/bfd/coff-rs6000.c
rename to x/binutils/bfd/coff-rs6000.c
diff --git a/contrib/binutils/bfd/coff-sparc.c b/x/binutils/bfd/coff-sparc.c
similarity index 100%
rename from contrib/binutils/bfd/coff-sparc.c
rename to x/binutils/bfd/coff-sparc.c
diff --git a/contrib/binutils/bfd/coff64-rs6000.c b/x/binutils/bfd/coff64-rs6000.c
similarity index 100%
rename from contrib/binutils/bfd/coff64-rs6000.c
rename to x/binutils/bfd/coff64-rs6000.c
diff --git a/contrib/binutils/bfd/coffcode.h b/x/binutils/bfd/coffcode.h
similarity index 100%
rename from contrib/binutils/bfd/coffcode.h
rename to x/binutils/bfd/coffcode.h
diff --git a/contrib/binutils/bfd/coffgen.c b/x/binutils/bfd/coffgen.c
similarity index 100%
rename from contrib/binutils/bfd/coffgen.c
rename to x/binutils/bfd/coffgen.c
diff --git a/contrib/binutils/bfd/cofflink.c b/x/binutils/bfd/cofflink.c
similarity index 100%
rename from contrib/binutils/bfd/cofflink.c
rename to x/binutils/bfd/cofflink.c
diff --git a/contrib/binutils/bfd/coffswap.h b/x/binutils/bfd/coffswap.h
similarity index 100%
rename from contrib/binutils/bfd/coffswap.h
rename to x/binutils/bfd/coffswap.h
diff --git a/contrib/binutils/bfd/config.bfd b/x/binutils/bfd/config.bfd
similarity index 100%
rename from contrib/binutils/bfd/config.bfd
rename to x/binutils/bfd/config.bfd
diff --git a/contrib/binutils/bfd/config.in b/x/binutils/bfd/config.in
similarity index 100%
rename from contrib/binutils/bfd/config.in
rename to x/binutils/bfd/config.in
diff --git a/contrib/binutils/bfd/configure b/x/binutils/bfd/configure
similarity index 100%
rename from contrib/binutils/bfd/configure
rename to x/binutils/bfd/configure
diff --git a/contrib/binutils/bfd/configure.host b/x/binutils/bfd/configure.host
similarity index 100%
rename from contrib/binutils/bfd/configure.host
rename to x/binutils/bfd/configure.host
diff --git a/contrib/binutils/bfd/configure.in b/x/binutils/bfd/configure.in
similarity index 100%
rename from contrib/binutils/bfd/configure.in
rename to x/binutils/bfd/configure.in
diff --git a/contrib/binutils/bfd/corefile.c b/x/binutils/bfd/corefile.c
similarity index 100%
rename from contrib/binutils/bfd/corefile.c
rename to x/binutils/bfd/corefile.c
diff --git a/contrib/binutils/bfd/cpu-alpha.c b/x/binutils/bfd/cpu-alpha.c
similarity index 100%
rename from contrib/binutils/bfd/cpu-alpha.c
rename to x/binutils/bfd/cpu-alpha.c
diff --git a/contrib/binutils/bfd/cpu-arc.c b/x/binutils/bfd/cpu-arc.c
similarity index 100%
rename from contrib/binutils/bfd/cpu-arc.c
rename to x/binutils/bfd/cpu-arc.c
diff --git a/contrib/binutils/bfd/cpu-arm.c b/x/binutils/bfd/cpu-arm.c
similarity index 100%
rename from contrib/binutils/bfd/cpu-arm.c
rename to x/binutils/bfd/cpu-arm.c
diff --git a/contrib/binutils/bfd/cpu-i386.c b/x/binutils/bfd/cpu-i386.c
similarity index 100%
rename from contrib/binutils/bfd/cpu-i386.c
rename to x/binutils/bfd/cpu-i386.c
diff --git a/contrib/binutils/bfd/cpu-ia64-opc.c b/x/binutils/bfd/cpu-ia64-opc.c
similarity index 100%
rename from contrib/binutils/bfd/cpu-ia64-opc.c
rename to x/binutils/bfd/cpu-ia64-opc.c
diff --git a/contrib/binutils/bfd/cpu-ia64.c b/x/binutils/bfd/cpu-ia64.c
similarity index 100%
rename from contrib/binutils/bfd/cpu-ia64.c
rename to x/binutils/bfd/cpu-ia64.c
diff --git a/contrib/binutils/bfd/cpu-mips.c b/x/binutils/bfd/cpu-mips.c
similarity index 100%
rename from contrib/binutils/bfd/cpu-mips.c
rename to x/binutils/bfd/cpu-mips.c
diff --git a/contrib/binutils/bfd/cpu-powerpc.c b/x/binutils/bfd/cpu-powerpc.c
similarity index 100%
rename from contrib/binutils/bfd/cpu-powerpc.c
rename to x/binutils/bfd/cpu-powerpc.c
diff --git a/contrib/binutils/bfd/cpu-rs6000.c b/x/binutils/bfd/cpu-rs6000.c
similarity index 100%
rename from contrib/binutils/bfd/cpu-rs6000.c
rename to x/binutils/bfd/cpu-rs6000.c
diff --git a/contrib/binutils/bfd/cpu-s390.c b/x/binutils/bfd/cpu-s390.c
similarity index 100%
rename from contrib/binutils/bfd/cpu-s390.c
rename to x/binutils/bfd/cpu-s390.c
diff --git a/contrib/binutils/bfd/cpu-sparc.c b/x/binutils/bfd/cpu-sparc.c
similarity index 100%
rename from contrib/binutils/bfd/cpu-sparc.c
rename to x/binutils/bfd/cpu-sparc.c
diff --git a/contrib/binutils/bfd/demo64.c b/x/binutils/bfd/demo64.c
similarity index 100%
rename from contrib/binutils/bfd/demo64.c
rename to x/binutils/bfd/demo64.c
diff --git a/contrib/binutils/bfd/dep-in.sed b/x/binutils/bfd/dep-in.sed
similarity index 100%
rename from contrib/binutils/bfd/dep-in.sed
rename to x/binutils/bfd/dep-in.sed
diff --git a/contrib/binutils/bfd/doc/ChangeLog b/x/binutils/bfd/doc/ChangeLog
similarity index 100%
rename from contrib/binutils/bfd/doc/ChangeLog
rename to x/binutils/bfd/doc/ChangeLog
diff --git a/contrib/binutils/bfd/doc/ChangeLog-9103 b/x/binutils/bfd/doc/ChangeLog-9103
similarity index 100%
rename from contrib/binutils/bfd/doc/ChangeLog-9103
rename to x/binutils/bfd/doc/ChangeLog-9103
diff --git a/contrib/binutils/bfd/doc/Makefile.am b/x/binutils/bfd/doc/Makefile.am
similarity index 100%
rename from contrib/binutils/bfd/doc/Makefile.am
rename to x/binutils/bfd/doc/Makefile.am
diff --git a/contrib/binutils/bfd/doc/Makefile.in b/x/binutils/bfd/doc/Makefile.in
similarity index 100%
rename from contrib/binutils/bfd/doc/Makefile.in
rename to x/binutils/bfd/doc/Makefile.in
diff --git a/contrib/binutils/bfd/doc/aoutx.texi b/x/binutils/bfd/doc/aoutx.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/aoutx.texi
rename to x/binutils/bfd/doc/aoutx.texi
diff --git a/contrib/binutils/bfd/doc/archive.texi b/x/binutils/bfd/doc/archive.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/archive.texi
rename to x/binutils/bfd/doc/archive.texi
diff --git a/contrib/binutils/bfd/doc/archures.texi b/x/binutils/bfd/doc/archures.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/archures.texi
rename to x/binutils/bfd/doc/archures.texi
diff --git a/contrib/binutils/bfd/doc/bfd.texi b/x/binutils/bfd/doc/bfd.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/bfd.texi
rename to x/binutils/bfd/doc/bfd.texi
diff --git a/contrib/binutils/bfd/doc/bfd.texinfo b/x/binutils/bfd/doc/bfd.texinfo
similarity index 100%
rename from contrib/binutils/bfd/doc/bfd.texinfo
rename to x/binutils/bfd/doc/bfd.texinfo
diff --git a/contrib/binutils/bfd/doc/bfdint.texi b/x/binutils/bfd/doc/bfdint.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/bfdint.texi
rename to x/binutils/bfd/doc/bfdint.texi
diff --git a/contrib/binutils/bfd/doc/bfdio.texi b/x/binutils/bfd/doc/bfdio.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/bfdio.texi
rename to x/binutils/bfd/doc/bfdio.texi
diff --git a/contrib/binutils/bfd/doc/bfdsumm.texi b/x/binutils/bfd/doc/bfdsumm.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/bfdsumm.texi
rename to x/binutils/bfd/doc/bfdsumm.texi
diff --git a/contrib/binutils/bfd/doc/bfdt.texi b/x/binutils/bfd/doc/bfdt.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/bfdt.texi
rename to x/binutils/bfd/doc/bfdt.texi
diff --git a/contrib/binutils/bfd/doc/bfdwin.texi b/x/binutils/bfd/doc/bfdwin.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/bfdwin.texi
rename to x/binutils/bfd/doc/bfdwin.texi
diff --git a/contrib/binutils/bfd/doc/cache.texi b/x/binutils/bfd/doc/cache.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/cache.texi
rename to x/binutils/bfd/doc/cache.texi
diff --git a/contrib/binutils/bfd/doc/chew.c b/x/binutils/bfd/doc/chew.c
similarity index 100%
rename from contrib/binutils/bfd/doc/chew.c
rename to x/binutils/bfd/doc/chew.c
diff --git a/contrib/binutils/bfd/doc/coffcode.texi b/x/binutils/bfd/doc/coffcode.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/coffcode.texi
rename to x/binutils/bfd/doc/coffcode.texi
diff --git a/contrib/binutils/bfd/doc/core.texi b/x/binutils/bfd/doc/core.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/core.texi
rename to x/binutils/bfd/doc/core.texi
diff --git a/contrib/binutils/bfd/doc/doc.str b/x/binutils/bfd/doc/doc.str
similarity index 100%
rename from contrib/binutils/bfd/doc/doc.str
rename to x/binutils/bfd/doc/doc.str
diff --git a/contrib/binutils/bfd/doc/elf.texi b/x/binutils/bfd/doc/elf.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/elf.texi
rename to x/binutils/bfd/doc/elf.texi
diff --git a/contrib/binutils/bfd/doc/elfcode.texi b/x/binutils/bfd/doc/elfcode.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/elfcode.texi
rename to x/binutils/bfd/doc/elfcode.texi
diff --git a/contrib/binutils/bfd/doc/fdl.texi b/x/binutils/bfd/doc/fdl.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/fdl.texi
rename to x/binutils/bfd/doc/fdl.texi
diff --git a/contrib/binutils/bfd/doc/format.texi b/x/binutils/bfd/doc/format.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/format.texi
rename to x/binutils/bfd/doc/format.texi
diff --git a/contrib/binutils/bfd/doc/hash.texi b/x/binutils/bfd/doc/hash.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/hash.texi
rename to x/binutils/bfd/doc/hash.texi
diff --git a/contrib/binutils/bfd/doc/header.sed b/x/binutils/bfd/doc/header.sed
similarity index 100%
rename from contrib/binutils/bfd/doc/header.sed
rename to x/binutils/bfd/doc/header.sed
diff --git a/contrib/binutils/bfd/doc/init.texi b/x/binutils/bfd/doc/init.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/init.texi
rename to x/binutils/bfd/doc/init.texi
diff --git a/contrib/binutils/bfd/doc/libbfd.texi b/x/binutils/bfd/doc/libbfd.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/libbfd.texi
rename to x/binutils/bfd/doc/libbfd.texi
diff --git a/contrib/binutils/bfd/doc/linker.texi b/x/binutils/bfd/doc/linker.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/linker.texi
rename to x/binutils/bfd/doc/linker.texi
diff --git a/contrib/binutils/bfd/doc/mmo.texi b/x/binutils/bfd/doc/mmo.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/mmo.texi
rename to x/binutils/bfd/doc/mmo.texi
diff --git a/contrib/binutils/bfd/doc/opncls.texi b/x/binutils/bfd/doc/opncls.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/opncls.texi
rename to x/binutils/bfd/doc/opncls.texi
diff --git a/contrib/binutils/bfd/doc/proto.str b/x/binutils/bfd/doc/proto.str
similarity index 100%
rename from contrib/binutils/bfd/doc/proto.str
rename to x/binutils/bfd/doc/proto.str
diff --git a/contrib/binutils/bfd/doc/reloc.texi b/x/binutils/bfd/doc/reloc.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/reloc.texi
rename to x/binutils/bfd/doc/reloc.texi
diff --git a/contrib/binutils/bfd/doc/section.texi b/x/binutils/bfd/doc/section.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/section.texi
rename to x/binutils/bfd/doc/section.texi
diff --git a/contrib/binutils/bfd/doc/syms.texi b/x/binutils/bfd/doc/syms.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/syms.texi
rename to x/binutils/bfd/doc/syms.texi
diff --git a/contrib/binutils/bfd/doc/targets.texi b/x/binutils/bfd/doc/targets.texi
similarity index 100%
rename from contrib/binutils/bfd/doc/targets.texi
rename to x/binutils/bfd/doc/targets.texi
diff --git a/contrib/binutils/bfd/dwarf1.c b/x/binutils/bfd/dwarf1.c
similarity index 100%
rename from contrib/binutils/bfd/dwarf1.c
rename to x/binutils/bfd/dwarf1.c
diff --git a/contrib/binutils/bfd/dwarf2.c b/x/binutils/bfd/dwarf2.c
similarity index 100%
rename from contrib/binutils/bfd/dwarf2.c
rename to x/binutils/bfd/dwarf2.c
diff --git a/contrib/binutils/bfd/ecoff.c b/x/binutils/bfd/ecoff.c
similarity index 100%
rename from contrib/binutils/bfd/ecoff.c
rename to x/binutils/bfd/ecoff.c
diff --git a/contrib/binutils/bfd/ecofflink.c b/x/binutils/bfd/ecofflink.c
similarity index 100%
rename from contrib/binutils/bfd/ecofflink.c
rename to x/binutils/bfd/ecofflink.c
diff --git a/contrib/binutils/bfd/ecoffswap.h b/x/binutils/bfd/ecoffswap.h
similarity index 100%
rename from contrib/binutils/bfd/ecoffswap.h
rename to x/binutils/bfd/ecoffswap.h
diff --git a/contrib/binutils/bfd/efi-app-ia32.c b/x/binutils/bfd/efi-app-ia32.c
similarity index 100%
rename from contrib/binutils/bfd/efi-app-ia32.c
rename to x/binutils/bfd/efi-app-ia32.c
diff --git a/contrib/binutils/bfd/efi-app-ia64.c b/x/binutils/bfd/efi-app-ia64.c
similarity index 100%
rename from contrib/binutils/bfd/efi-app-ia64.c
rename to x/binutils/bfd/efi-app-ia64.c
diff --git a/contrib/binutils/bfd/elf-bfd.h b/x/binutils/bfd/elf-bfd.h
similarity index 100%
rename from contrib/binutils/bfd/elf-bfd.h
rename to x/binutils/bfd/elf-bfd.h
diff --git a/contrib/binutils/bfd/elf-eh-frame.c b/x/binutils/bfd/elf-eh-frame.c
similarity index 100%
rename from contrib/binutils/bfd/elf-eh-frame.c
rename to x/binutils/bfd/elf-eh-frame.c
diff --git a/contrib/binutils/bfd/elf-strtab.c b/x/binutils/bfd/elf-strtab.c
similarity index 100%
rename from contrib/binutils/bfd/elf-strtab.c
rename to x/binutils/bfd/elf-strtab.c
diff --git a/contrib/binutils/bfd/elf.c b/x/binutils/bfd/elf.c
similarity index 100%
rename from contrib/binutils/bfd/elf.c
rename to x/binutils/bfd/elf.c
diff --git a/contrib/binutils/bfd/elf32-arc.c b/x/binutils/bfd/elf32-arc.c
similarity index 100%
rename from contrib/binutils/bfd/elf32-arc.c
rename to x/binutils/bfd/elf32-arc.c
diff --git a/contrib/binutils/bfd/elf32-arm.h b/x/binutils/bfd/elf32-arm.h
similarity index 100%
rename from contrib/binutils/bfd/elf32-arm.h
rename to x/binutils/bfd/elf32-arm.h
diff --git a/contrib/binutils/bfd/elf32-gen.c b/x/binutils/bfd/elf32-gen.c
similarity index 100%
rename from contrib/binutils/bfd/elf32-gen.c
rename to x/binutils/bfd/elf32-gen.c
diff --git a/contrib/binutils/bfd/elf32-i386-fbsd.c b/x/binutils/bfd/elf32-i386-fbsd.c
similarity index 100%
rename from contrib/binutils/bfd/elf32-i386-fbsd.c
rename to x/binutils/bfd/elf32-i386-fbsd.c
diff --git a/contrib/binutils/bfd/elf32-i386.c b/x/binutils/bfd/elf32-i386.c
similarity index 100%
rename from contrib/binutils/bfd/elf32-i386.c
rename to x/binutils/bfd/elf32-i386.c
diff --git a/contrib/binutils/bfd/elf32-mips.c b/x/binutils/bfd/elf32-mips.c
similarity index 100%
rename from contrib/binutils/bfd/elf32-mips.c
rename to x/binutils/bfd/elf32-mips.c
diff --git a/contrib/binutils/bfd/elf32-ppc.c b/x/binutils/bfd/elf32-ppc.c
similarity index 100%
rename from contrib/binutils/bfd/elf32-ppc.c
rename to x/binutils/bfd/elf32-ppc.c
diff --git a/contrib/binutils/bfd/elf32-ppc.h b/x/binutils/bfd/elf32-ppc.h
similarity index 100%
rename from contrib/binutils/bfd/elf32-ppc.h
rename to x/binutils/bfd/elf32-ppc.h
diff --git a/contrib/binutils/bfd/elf32-s390.c b/x/binutils/bfd/elf32-s390.c
similarity index 100%
rename from contrib/binutils/bfd/elf32-s390.c
rename to x/binutils/bfd/elf32-s390.c
diff --git a/contrib/binutils/bfd/elf32-sparc.c b/x/binutils/bfd/elf32-sparc.c
similarity index 100%
rename from contrib/binutils/bfd/elf32-sparc.c
rename to x/binutils/bfd/elf32-sparc.c
diff --git a/contrib/binutils/bfd/elf32.c b/x/binutils/bfd/elf32.c
similarity index 100%
rename from contrib/binutils/bfd/elf32.c
rename to x/binutils/bfd/elf32.c
diff --git a/contrib/binutils/bfd/elf64-alpha-fbsd.c b/x/binutils/bfd/elf64-alpha-fbsd.c
similarity index 100%
rename from contrib/binutils/bfd/elf64-alpha-fbsd.c
rename to x/binutils/bfd/elf64-alpha-fbsd.c
diff --git a/contrib/binutils/bfd/elf64-alpha.c b/x/binutils/bfd/elf64-alpha.c
similarity index 100%
rename from contrib/binutils/bfd/elf64-alpha.c
rename to x/binutils/bfd/elf64-alpha.c
diff --git a/contrib/binutils/bfd/elf64-gen.c b/x/binutils/bfd/elf64-gen.c
similarity index 100%
rename from contrib/binutils/bfd/elf64-gen.c
rename to x/binutils/bfd/elf64-gen.c
diff --git a/contrib/binutils/bfd/elf64-mips.c b/x/binutils/bfd/elf64-mips.c
similarity index 100%
rename from contrib/binutils/bfd/elf64-mips.c
rename to x/binutils/bfd/elf64-mips.c
diff --git a/contrib/binutils/bfd/elf64-ppc.c b/x/binutils/bfd/elf64-ppc.c
similarity index 100%
rename from contrib/binutils/bfd/elf64-ppc.c
rename to x/binutils/bfd/elf64-ppc.c
diff --git a/contrib/binutils/bfd/elf64-ppc.h b/x/binutils/bfd/elf64-ppc.h
similarity index 100%
rename from contrib/binutils/bfd/elf64-ppc.h
rename to x/binutils/bfd/elf64-ppc.h
diff --git a/contrib/binutils/bfd/elf64-s390.c b/x/binutils/bfd/elf64-s390.c
similarity index 100%
rename from contrib/binutils/bfd/elf64-s390.c
rename to x/binutils/bfd/elf64-s390.c
diff --git a/contrib/binutils/bfd/elf64-sparc.c b/x/binutils/bfd/elf64-sparc.c
similarity index 100%
rename from contrib/binutils/bfd/elf64-sparc.c
rename to x/binutils/bfd/elf64-sparc.c
diff --git a/contrib/binutils/bfd/elf64-x86-64.c b/x/binutils/bfd/elf64-x86-64.c
similarity index 100%
rename from contrib/binutils/bfd/elf64-x86-64.c
rename to x/binutils/bfd/elf64-x86-64.c
diff --git a/contrib/binutils/bfd/elf64.c b/x/binutils/bfd/elf64.c
similarity index 100%
rename from contrib/binutils/bfd/elf64.c
rename to x/binutils/bfd/elf64.c
diff --git a/contrib/binutils/bfd/elfarm-nabi.c b/x/binutils/bfd/elfarm-nabi.c
similarity index 100%
rename from contrib/binutils/bfd/elfarm-nabi.c
rename to x/binutils/bfd/elfarm-nabi.c
diff --git a/contrib/binutils/bfd/elfarm-oabi.c b/x/binutils/bfd/elfarm-oabi.c
similarity index 100%
rename from contrib/binutils/bfd/elfarm-oabi.c
rename to x/binutils/bfd/elfarm-oabi.c
diff --git a/contrib/binutils/bfd/elfcode.h b/x/binutils/bfd/elfcode.h
similarity index 100%
rename from contrib/binutils/bfd/elfcode.h
rename to x/binutils/bfd/elfcode.h
diff --git a/contrib/binutils/bfd/elfcore.h b/x/binutils/bfd/elfcore.h
similarity index 100%
rename from contrib/binutils/bfd/elfcore.h
rename to x/binutils/bfd/elfcore.h
diff --git a/contrib/binutils/bfd/elflink.c b/x/binutils/bfd/elflink.c
similarity index 100%
rename from contrib/binutils/bfd/elflink.c
rename to x/binutils/bfd/elflink.c
diff --git a/contrib/binutils/bfd/elflink.h b/x/binutils/bfd/elflink.h
similarity index 100%
rename from contrib/binutils/bfd/elflink.h
rename to x/binutils/bfd/elflink.h
diff --git a/contrib/binutils/bfd/elfn32-mips.c b/x/binutils/bfd/elfn32-mips.c
similarity index 100%
rename from contrib/binutils/bfd/elfn32-mips.c
rename to x/binutils/bfd/elfn32-mips.c
diff --git a/contrib/binutils/bfd/elfxx-ia64.c b/x/binutils/bfd/elfxx-ia64.c
similarity index 100%
rename from contrib/binutils/bfd/elfxx-ia64.c
rename to x/binutils/bfd/elfxx-ia64.c
diff --git a/contrib/binutils/bfd/elfxx-mips.c b/x/binutils/bfd/elfxx-mips.c
similarity index 100%
rename from contrib/binutils/bfd/elfxx-mips.c
rename to x/binutils/bfd/elfxx-mips.c
diff --git a/contrib/binutils/bfd/elfxx-mips.h b/x/binutils/bfd/elfxx-mips.h
similarity index 100%
rename from contrib/binutils/bfd/elfxx-mips.h
rename to x/binutils/bfd/elfxx-mips.h
diff --git a/contrib/binutils/bfd/elfxx-target.h b/x/binutils/bfd/elfxx-target.h
similarity index 100%
rename from contrib/binutils/bfd/elfxx-target.h
rename to x/binutils/bfd/elfxx-target.h
diff --git a/contrib/binutils/bfd/format.c b/x/binutils/bfd/format.c
similarity index 100%
rename from contrib/binutils/bfd/format.c
rename to x/binutils/bfd/format.c
diff --git a/contrib/binutils/bfd/freebsd.h b/x/binutils/bfd/freebsd.h
similarity index 100%
rename from contrib/binutils/bfd/freebsd.h
rename to x/binutils/bfd/freebsd.h
diff --git a/contrib/binutils/bfd/gen-aout.c b/x/binutils/bfd/gen-aout.c
similarity index 100%
rename from contrib/binutils/bfd/gen-aout.c
rename to x/binutils/bfd/gen-aout.c
diff --git a/contrib/binutils/bfd/genlink.h b/x/binutils/bfd/genlink.h
similarity index 100%
rename from contrib/binutils/bfd/genlink.h
rename to x/binutils/bfd/genlink.h
diff --git a/contrib/binutils/bfd/hash.c b/x/binutils/bfd/hash.c
similarity index 100%
rename from contrib/binutils/bfd/hash.c
rename to x/binutils/bfd/hash.c
diff --git a/contrib/binutils/bfd/host-aout.c b/x/binutils/bfd/host-aout.c
similarity index 100%
rename from contrib/binutils/bfd/host-aout.c
rename to x/binutils/bfd/host-aout.c
diff --git a/contrib/binutils/bfd/hosts/alphalinux.h b/x/binutils/bfd/hosts/alphalinux.h
similarity index 100%
rename from contrib/binutils/bfd/hosts/alphalinux.h
rename to x/binutils/bfd/hosts/alphalinux.h
diff --git a/contrib/binutils/bfd/hosts/decstation.h b/x/binutils/bfd/hosts/decstation.h
similarity index 100%
rename from contrib/binutils/bfd/hosts/decstation.h
rename to x/binutils/bfd/hosts/decstation.h
diff --git a/contrib/binutils/bfd/hosts/i386bsd.h b/x/binutils/bfd/hosts/i386bsd.h
similarity index 100%
rename from contrib/binutils/bfd/hosts/i386bsd.h
rename to x/binutils/bfd/hosts/i386bsd.h
diff --git a/contrib/binutils/bfd/hosts/i386linux.h b/x/binutils/bfd/hosts/i386linux.h
similarity index 100%
rename from contrib/binutils/bfd/hosts/i386linux.h
rename to x/binutils/bfd/hosts/i386linux.h
diff --git a/contrib/binutils/bfd/hosts/i386sco.h b/x/binutils/bfd/hosts/i386sco.h
similarity index 100%
rename from contrib/binutils/bfd/hosts/i386sco.h
rename to x/binutils/bfd/hosts/i386sco.h
diff --git a/contrib/binutils/bfd/hosts/mipsbsd.h b/x/binutils/bfd/hosts/mipsbsd.h
similarity index 100%
rename from contrib/binutils/bfd/hosts/mipsbsd.h
rename to x/binutils/bfd/hosts/mipsbsd.h
diff --git a/contrib/binutils/bfd/hosts/mipsmach3.h b/x/binutils/bfd/hosts/mipsmach3.h
similarity index 100%
rename from contrib/binutils/bfd/hosts/mipsmach3.h
rename to x/binutils/bfd/hosts/mipsmach3.h
diff --git a/contrib/binutils/bfd/hosts/news-mips.h b/x/binutils/bfd/hosts/news-mips.h
similarity index 100%
rename from contrib/binutils/bfd/hosts/news-mips.h
rename to x/binutils/bfd/hosts/news-mips.h
diff --git a/contrib/binutils/bfd/i386aout.c b/x/binutils/bfd/i386aout.c
similarity index 100%
rename from contrib/binutils/bfd/i386aout.c
rename to x/binutils/bfd/i386aout.c
diff --git a/contrib/binutils/bfd/i386bsd.c b/x/binutils/bfd/i386bsd.c
similarity index 100%
rename from contrib/binutils/bfd/i386bsd.c
rename to x/binutils/bfd/i386bsd.c
diff --git a/contrib/binutils/bfd/i386freebsd.c b/x/binutils/bfd/i386freebsd.c
similarity index 100%
rename from contrib/binutils/bfd/i386freebsd.c
rename to x/binutils/bfd/i386freebsd.c
diff --git a/contrib/binutils/bfd/i386linux.c b/x/binutils/bfd/i386linux.c
similarity index 100%
rename from contrib/binutils/bfd/i386linux.c
rename to x/binutils/bfd/i386linux.c
diff --git a/contrib/binutils/bfd/i386netbsd.c b/x/binutils/bfd/i386netbsd.c
similarity index 100%
rename from contrib/binutils/bfd/i386netbsd.c
rename to x/binutils/bfd/i386netbsd.c
diff --git a/contrib/binutils/bfd/ieee.c b/x/binutils/bfd/ieee.c
similarity index 100%
rename from contrib/binutils/bfd/ieee.c
rename to x/binutils/bfd/ieee.c
diff --git a/contrib/binutils/bfd/ihex.c b/x/binutils/bfd/ihex.c
similarity index 100%
rename from contrib/binutils/bfd/ihex.c
rename to x/binutils/bfd/ihex.c
diff --git a/contrib/binutils/bfd/init.c b/x/binutils/bfd/init.c
similarity index 100%
rename from contrib/binutils/bfd/init.c
rename to x/binutils/bfd/init.c
diff --git a/contrib/binutils/bfd/libaout.h b/x/binutils/bfd/libaout.h
similarity index 100%
rename from contrib/binutils/bfd/libaout.h
rename to x/binutils/bfd/libaout.h
diff --git a/contrib/binutils/bfd/libbfd-in.h b/x/binutils/bfd/libbfd-in.h
similarity index 100%
rename from contrib/binutils/bfd/libbfd-in.h
rename to x/binutils/bfd/libbfd-in.h
diff --git a/contrib/binutils/bfd/libbfd.c b/x/binutils/bfd/libbfd.c
similarity index 100%
rename from contrib/binutils/bfd/libbfd.c
rename to x/binutils/bfd/libbfd.c
diff --git a/contrib/binutils/bfd/libbfd.h b/x/binutils/bfd/libbfd.h
similarity index 100%
rename from contrib/binutils/bfd/libbfd.h
rename to x/binutils/bfd/libbfd.h
diff --git a/contrib/binutils/bfd/libcoff-in.h b/x/binutils/bfd/libcoff-in.h
similarity index 100%
rename from contrib/binutils/bfd/libcoff-in.h
rename to x/binutils/bfd/libcoff-in.h
diff --git a/contrib/binutils/bfd/libcoff.h b/x/binutils/bfd/libcoff.h
similarity index 100%
rename from contrib/binutils/bfd/libcoff.h
rename to x/binutils/bfd/libcoff.h
diff --git a/contrib/binutils/bfd/libecoff.h b/x/binutils/bfd/libecoff.h
similarity index 100%
rename from contrib/binutils/bfd/libecoff.h
rename to x/binutils/bfd/libecoff.h
diff --git a/contrib/binutils/bfd/libieee.h b/x/binutils/bfd/libieee.h
similarity index 100%
rename from contrib/binutils/bfd/libieee.h
rename to x/binutils/bfd/libieee.h
diff --git a/contrib/binutils/bfd/libpei.h b/x/binutils/bfd/libpei.h
similarity index 100%
rename from contrib/binutils/bfd/libpei.h
rename to x/binutils/bfd/libpei.h
diff --git a/contrib/binutils/bfd/libxcoff.h b/x/binutils/bfd/libxcoff.h
similarity index 100%
rename from contrib/binutils/bfd/libxcoff.h
rename to x/binutils/bfd/libxcoff.h
diff --git a/contrib/binutils/bfd/linker.c b/x/binutils/bfd/linker.c
similarity index 100%
rename from contrib/binutils/bfd/linker.c
rename to x/binutils/bfd/linker.c
diff --git a/contrib/binutils/bfd/merge.c b/x/binutils/bfd/merge.c
similarity index 100%
rename from contrib/binutils/bfd/merge.c
rename to x/binutils/bfd/merge.c
diff --git a/contrib/binutils/bfd/mipsbsd.c b/x/binutils/bfd/mipsbsd.c
similarity index 100%
rename from contrib/binutils/bfd/mipsbsd.c
rename to x/binutils/bfd/mipsbsd.c
diff --git a/contrib/binutils/bfd/netbsd-core.c b/x/binutils/bfd/netbsd-core.c
similarity index 100%
rename from contrib/binutils/bfd/netbsd-core.c
rename to x/binutils/bfd/netbsd-core.c
diff --git a/contrib/binutils/bfd/netbsd.h b/x/binutils/bfd/netbsd.h
similarity index 100%
rename from contrib/binutils/bfd/netbsd.h
rename to x/binutils/bfd/netbsd.h
diff --git a/contrib/binutils/bfd/opncls.c b/x/binutils/bfd/opncls.c
similarity index 100%
rename from contrib/binutils/bfd/opncls.c
rename to x/binutils/bfd/opncls.c
diff --git a/contrib/binutils/bfd/osf-core.c b/x/binutils/bfd/osf-core.c
similarity index 100%
rename from contrib/binutils/bfd/osf-core.c
rename to x/binutils/bfd/osf-core.c
diff --git a/contrib/binutils/bfd/pe-arm.c b/x/binutils/bfd/pe-arm.c
similarity index 100%
rename from contrib/binutils/bfd/pe-arm.c
rename to x/binutils/bfd/pe-arm.c
diff --git a/contrib/binutils/bfd/pe-i386.c b/x/binutils/bfd/pe-i386.c
similarity index 100%
rename from contrib/binutils/bfd/pe-i386.c
rename to x/binutils/bfd/pe-i386.c
diff --git a/contrib/binutils/bfd/pe-mips.c b/x/binutils/bfd/pe-mips.c
similarity index 100%
rename from contrib/binutils/bfd/pe-mips.c
rename to x/binutils/bfd/pe-mips.c
diff --git a/contrib/binutils/bfd/pe-ppc.c b/x/binutils/bfd/pe-ppc.c
similarity index 100%
rename from contrib/binutils/bfd/pe-ppc.c
rename to x/binutils/bfd/pe-ppc.c
diff --git a/contrib/binutils/bfd/peXXigen.c b/x/binutils/bfd/peXXigen.c
similarity index 100%
rename from contrib/binutils/bfd/peXXigen.c
rename to x/binutils/bfd/peXXigen.c
diff --git a/contrib/binutils/bfd/pei-mips.c b/x/binutils/bfd/pei-mips.c
similarity index 100%
rename from contrib/binutils/bfd/pei-mips.c
rename to x/binutils/bfd/pei-mips.c
diff --git a/contrib/binutils/bfd/peicode.h b/x/binutils/bfd/peicode.h
similarity index 100%
rename from contrib/binutils/bfd/peicode.h
rename to x/binutils/bfd/peicode.h
diff --git a/contrib/binutils/bfd/po/BLD-POTFILES.in b/x/binutils/bfd/po/BLD-POTFILES.in
similarity index 100%
rename from contrib/binutils/bfd/po/BLD-POTFILES.in
rename to x/binutils/bfd/po/BLD-POTFILES.in
diff --git a/contrib/binutils/bfd/po/Make-in b/x/binutils/bfd/po/Make-in
similarity index 100%
rename from contrib/binutils/bfd/po/Make-in
rename to x/binutils/bfd/po/Make-in
diff --git a/contrib/binutils/bfd/po/POTFILES.in b/x/binutils/bfd/po/POTFILES.in
similarity index 100%
rename from contrib/binutils/bfd/po/POTFILES.in
rename to x/binutils/bfd/po/POTFILES.in
diff --git a/contrib/binutils/bfd/po/SRC-POTFILES.in b/x/binutils/bfd/po/SRC-POTFILES.in
similarity index 100%
rename from contrib/binutils/bfd/po/SRC-POTFILES.in
rename to x/binutils/bfd/po/SRC-POTFILES.in
diff --git a/contrib/binutils/bfd/po/bfd.pot b/x/binutils/bfd/po/bfd.pot
similarity index 100%
rename from contrib/binutils/bfd/po/bfd.pot
rename to x/binutils/bfd/po/bfd.pot
diff --git a/contrib/binutils/bfd/ppcboot.c b/x/binutils/bfd/ppcboot.c
similarity index 100%
rename from contrib/binutils/bfd/ppcboot.c
rename to x/binutils/bfd/ppcboot.c
diff --git a/contrib/binutils/bfd/ptrace-core.c b/x/binutils/bfd/ptrace-core.c
similarity index 100%
rename from contrib/binutils/bfd/ptrace-core.c
rename to x/binutils/bfd/ptrace-core.c
diff --git a/contrib/binutils/bfd/reloc.c b/x/binutils/bfd/reloc.c
similarity index 100%
rename from contrib/binutils/bfd/reloc.c
rename to x/binutils/bfd/reloc.c
diff --git a/contrib/binutils/bfd/reloc16.c b/x/binutils/bfd/reloc16.c
similarity index 100%
rename from contrib/binutils/bfd/reloc16.c
rename to x/binutils/bfd/reloc16.c
diff --git a/contrib/binutils/bfd/rs6000-core.c b/x/binutils/bfd/rs6000-core.c
similarity index 100%
rename from contrib/binutils/bfd/rs6000-core.c
rename to x/binutils/bfd/rs6000-core.c
diff --git a/contrib/binutils/bfd/sco5-core.c b/x/binutils/bfd/sco5-core.c
similarity index 100%
rename from contrib/binutils/bfd/sco5-core.c
rename to x/binutils/bfd/sco5-core.c
diff --git a/contrib/binutils/bfd/section.c b/x/binutils/bfd/section.c
similarity index 100%
rename from contrib/binutils/bfd/section.c
rename to x/binutils/bfd/section.c
diff --git a/contrib/binutils/bfd/simple.c b/x/binutils/bfd/simple.c
similarity index 100%
rename from contrib/binutils/bfd/simple.c
rename to x/binutils/bfd/simple.c
diff --git a/contrib/binutils/bfd/sparclinux.c b/x/binutils/bfd/sparclinux.c
similarity index 100%
rename from contrib/binutils/bfd/sparclinux.c
rename to x/binutils/bfd/sparclinux.c
diff --git a/contrib/binutils/bfd/sparcnetbsd.c b/x/binutils/bfd/sparcnetbsd.c
similarity index 100%
rename from contrib/binutils/bfd/sparcnetbsd.c
rename to x/binutils/bfd/sparcnetbsd.c
diff --git a/contrib/binutils/bfd/srec.c b/x/binutils/bfd/srec.c
similarity index 100%
rename from contrib/binutils/bfd/srec.c
rename to x/binutils/bfd/srec.c
diff --git a/contrib/binutils/bfd/stab-syms.c b/x/binutils/bfd/stab-syms.c
similarity index 100%
rename from contrib/binutils/bfd/stab-syms.c
rename to x/binutils/bfd/stab-syms.c
diff --git a/contrib/binutils/bfd/stabs.c b/x/binutils/bfd/stabs.c
similarity index 100%
rename from contrib/binutils/bfd/stabs.c
rename to x/binutils/bfd/stabs.c
diff --git a/contrib/binutils/bfd/stamp-h.in b/x/binutils/bfd/stamp-h.in
similarity index 100%
rename from contrib/binutils/bfd/stamp-h.in
rename to x/binutils/bfd/stamp-h.in
diff --git a/contrib/binutils/bfd/sunos.c b/x/binutils/bfd/sunos.c
similarity index 100%
rename from contrib/binutils/bfd/sunos.c
rename to x/binutils/bfd/sunos.c
diff --git a/contrib/binutils/bfd/syms.c b/x/binutils/bfd/syms.c
similarity index 100%
rename from contrib/binutils/bfd/syms.c
rename to x/binutils/bfd/syms.c
diff --git a/contrib/binutils/bfd/sysdep.h b/x/binutils/bfd/sysdep.h
similarity index 100%
rename from contrib/binutils/bfd/sysdep.h
rename to x/binutils/bfd/sysdep.h
diff --git a/contrib/binutils/bfd/targets.c b/x/binutils/bfd/targets.c
similarity index 100%
rename from contrib/binutils/bfd/targets.c
rename to x/binutils/bfd/targets.c
diff --git a/contrib/binutils/bfd/targmatch.sed b/x/binutils/bfd/targmatch.sed
similarity index 100%
rename from contrib/binutils/bfd/targmatch.sed
rename to x/binutils/bfd/targmatch.sed
diff --git a/contrib/binutils/bfd/tekhex.c b/x/binutils/bfd/tekhex.c
similarity index 100%
rename from contrib/binutils/bfd/tekhex.c
rename to x/binutils/bfd/tekhex.c
diff --git a/contrib/binutils/bfd/trad-core.c b/x/binutils/bfd/trad-core.c
similarity index 100%
rename from contrib/binutils/bfd/trad-core.c
rename to x/binutils/bfd/trad-core.c
diff --git a/contrib/binutils/bfd/version.h b/x/binutils/bfd/version.h
similarity index 100%
rename from contrib/binutils/bfd/version.h
rename to x/binutils/bfd/version.h
diff --git a/contrib/binutils/bfd/xcoff-target.h b/x/binutils/bfd/xcoff-target.h
similarity index 100%
rename from contrib/binutils/bfd/xcoff-target.h
rename to x/binutils/bfd/xcoff-target.h
diff --git a/contrib/binutils/bfd/xcofflink.c b/x/binutils/bfd/xcofflink.c
similarity index 100%
rename from contrib/binutils/bfd/xcofflink.c
rename to x/binutils/bfd/xcofflink.c
diff --git a/contrib/binutils/binutils/ChangeLog b/x/binutils/binutils/ChangeLog
similarity index 100%
rename from contrib/binutils/binutils/ChangeLog
rename to x/binutils/binutils/ChangeLog
diff --git a/contrib/binutils/binutils/ChangeLog-0001 b/x/binutils/binutils/ChangeLog-0001
similarity index 100%
rename from contrib/binutils/binutils/ChangeLog-0001
rename to x/binutils/binutils/ChangeLog-0001
diff --git a/contrib/binutils/binutils/ChangeLog-0203 b/x/binutils/binutils/ChangeLog-0203
similarity index 100%
rename from contrib/binutils/binutils/ChangeLog-0203
rename to x/binutils/binutils/ChangeLog-0203
diff --git a/contrib/binutils/binutils/ChangeLog-9197 b/x/binutils/binutils/ChangeLog-9197
similarity index 100%
rename from contrib/binutils/binutils/ChangeLog-9197
rename to x/binutils/binutils/ChangeLog-9197
diff --git a/contrib/binutils/binutils/ChangeLog-9899 b/x/binutils/binutils/ChangeLog-9899
similarity index 100%
rename from contrib/binutils/binutils/ChangeLog-9899
rename to x/binutils/binutils/ChangeLog-9899
diff --git a/contrib/binutils/binutils/MAINTAINERS b/x/binutils/binutils/MAINTAINERS
similarity index 100%
rename from contrib/binutils/binutils/MAINTAINERS
rename to x/binutils/binutils/MAINTAINERS
diff --git a/contrib/binutils/binutils/Makefile.am b/x/binutils/binutils/Makefile.am
similarity index 100%
rename from contrib/binutils/binutils/Makefile.am
rename to x/binutils/binutils/Makefile.am
diff --git a/contrib/binutils/binutils/Makefile.in b/x/binutils/binutils/Makefile.in
similarity index 100%
rename from contrib/binutils/binutils/Makefile.in
rename to x/binutils/binutils/Makefile.in
diff --git a/contrib/binutils/binutils/NEWS b/x/binutils/binutils/NEWS
similarity index 100%
rename from contrib/binutils/binutils/NEWS
rename to x/binutils/binutils/NEWS
diff --git a/contrib/binutils/binutils/README b/x/binutils/binutils/README
similarity index 100%
rename from contrib/binutils/binutils/README
rename to x/binutils/binutils/README
diff --git a/contrib/binutils/binutils/acconfig.h b/x/binutils/binutils/acconfig.h
similarity index 100%
rename from contrib/binutils/binutils/acconfig.h
rename to x/binutils/binutils/acconfig.h
diff --git a/contrib/binutils/binutils/acinclude.m4 b/x/binutils/binutils/acinclude.m4
similarity index 100%
rename from contrib/binutils/binutils/acinclude.m4
rename to x/binutils/binutils/acinclude.m4
diff --git a/contrib/binutils/binutils/aclocal.m4 b/x/binutils/binutils/aclocal.m4
similarity index 100%
rename from contrib/binutils/binutils/aclocal.m4
rename to x/binutils/binutils/aclocal.m4
diff --git a/contrib/binutils/binutils/addr2line.1 b/x/binutils/binutils/addr2line.1
similarity index 100%
rename from contrib/binutils/binutils/addr2line.1
rename to x/binutils/binutils/addr2line.1
diff --git a/contrib/binutils/binutils/addr2line.c b/x/binutils/binutils/addr2line.c
similarity index 100%
rename from contrib/binutils/binutils/addr2line.c
rename to x/binutils/binutils/addr2line.c
diff --git a/contrib/binutils/binutils/ar.1 b/x/binutils/binutils/ar.1
similarity index 100%
rename from contrib/binutils/binutils/ar.1
rename to x/binutils/binutils/ar.1
diff --git a/contrib/binutils/binutils/ar.c b/x/binutils/binutils/ar.c
similarity index 100%
rename from contrib/binutils/binutils/ar.c
rename to x/binutils/binutils/ar.c
diff --git a/contrib/binutils/binutils/arlex.l b/x/binutils/binutils/arlex.l
similarity index 100%
rename from contrib/binutils/binutils/arlex.l
rename to x/binutils/binutils/arlex.l
diff --git a/contrib/binutils/binutils/arparse.y b/x/binutils/binutils/arparse.y
similarity index 100%
rename from contrib/binutils/binutils/arparse.y
rename to x/binutils/binutils/arparse.y
diff --git a/contrib/binutils/binutils/arsup.c b/x/binutils/binutils/arsup.c
similarity index 100%
rename from contrib/binutils/binutils/arsup.c
rename to x/binutils/binutils/arsup.c
diff --git a/contrib/binutils/binutils/arsup.h b/x/binutils/binutils/arsup.h
similarity index 100%
rename from contrib/binutils/binutils/arsup.h
rename to x/binutils/binutils/arsup.h
diff --git a/contrib/binutils/binutils/binemul.c b/x/binutils/binutils/binemul.c
similarity index 100%
rename from contrib/binutils/binutils/binemul.c
rename to x/binutils/binutils/binemul.c
diff --git a/contrib/binutils/binutils/binemul.h b/x/binutils/binutils/binemul.h
similarity index 100%
rename from contrib/binutils/binutils/binemul.h
rename to x/binutils/binutils/binemul.h
diff --git a/contrib/binutils/binutils/binutils.texi b/x/binutils/binutils/binutils.texi
similarity index 100%
rename from contrib/binutils/binutils/binutils.texi
rename to x/binutils/binutils/binutils.texi
diff --git a/contrib/binutils/binutils/bucomm.c b/x/binutils/binutils/bucomm.c
similarity index 100%
rename from contrib/binutils/binutils/bucomm.c
rename to x/binutils/binutils/bucomm.c
diff --git a/contrib/binutils/binutils/bucomm.h b/x/binutils/binutils/bucomm.h
similarity index 100%
rename from contrib/binutils/binutils/bucomm.h
rename to x/binutils/binutils/bucomm.h
diff --git a/contrib/binutils/binutils/budbg.h b/x/binutils/binutils/budbg.h
similarity index 100%
rename from contrib/binutils/binutils/budbg.h
rename to x/binutils/binutils/budbg.h
diff --git a/contrib/binutils/binutils/budemang.c b/x/binutils/binutils/budemang.c
similarity index 100%
rename from contrib/binutils/binutils/budemang.c
rename to x/binutils/binutils/budemang.c
diff --git a/contrib/binutils/binutils/budemang.h b/x/binutils/binutils/budemang.h
similarity index 100%
rename from contrib/binutils/binutils/budemang.h
rename to x/binutils/binutils/budemang.h
diff --git a/contrib/binutils/binutils/coffdump.c b/x/binutils/binutils/coffdump.c
similarity index 100%
rename from contrib/binutils/binutils/coffdump.c
rename to x/binutils/binutils/coffdump.c
diff --git a/contrib/binutils/binutils/coffgrok.c b/x/binutils/binutils/coffgrok.c
similarity index 100%
rename from contrib/binutils/binutils/coffgrok.c
rename to x/binutils/binutils/coffgrok.c
diff --git a/contrib/binutils/binutils/coffgrok.h b/x/binutils/binutils/coffgrok.h
similarity index 100%
rename from contrib/binutils/binutils/coffgrok.h
rename to x/binutils/binutils/coffgrok.h
diff --git a/contrib/binutils/binutils/config.in b/x/binutils/binutils/config.in
similarity index 100%
rename from contrib/binutils/binutils/config.in
rename to x/binutils/binutils/config.in
diff --git a/contrib/binutils/binutils/config.texi b/x/binutils/binutils/config.texi
similarity index 100%
rename from contrib/binutils/binutils/config.texi
rename to x/binutils/binutils/config.texi
diff --git a/contrib/binutils/binutils/configure b/x/binutils/binutils/configure
similarity index 100%
rename from contrib/binutils/binutils/configure
rename to x/binutils/binutils/configure
diff --git a/contrib/binutils/binutils/configure.in b/x/binutils/binutils/configure.in
similarity index 100%
rename from contrib/binutils/binutils/configure.in
rename to x/binutils/binutils/configure.in
diff --git a/contrib/binutils/binutils/configure.tgt b/x/binutils/binutils/configure.tgt
similarity index 100%
rename from contrib/binutils/binutils/configure.tgt
rename to x/binutils/binutils/configure.tgt
diff --git a/contrib/binutils/binutils/cxxfilt.c b/x/binutils/binutils/cxxfilt.c
similarity index 100%
rename from contrib/binutils/binutils/cxxfilt.c
rename to x/binutils/binutils/cxxfilt.c
diff --git a/contrib/binutils/binutils/cxxfilt.man b/x/binutils/binutils/cxxfilt.man
similarity index 100%
rename from contrib/binutils/binutils/cxxfilt.man
rename to x/binutils/binutils/cxxfilt.man
diff --git a/contrib/binutils/binutils/debug.c b/x/binutils/binutils/debug.c
similarity index 100%
rename from contrib/binutils/binutils/debug.c
rename to x/binutils/binutils/debug.c
diff --git a/contrib/binutils/binutils/debug.h b/x/binutils/binutils/debug.h
similarity index 100%
rename from contrib/binutils/binutils/debug.h
rename to x/binutils/binutils/debug.h
diff --git a/contrib/binutils/binutils/deflex.l b/x/binutils/binutils/deflex.l
similarity index 100%
rename from contrib/binutils/binutils/deflex.l
rename to x/binutils/binutils/deflex.l
diff --git a/contrib/binutils/binutils/defparse.c b/x/binutils/binutils/defparse.c
similarity index 100%
rename from contrib/binutils/binutils/defparse.c
rename to x/binutils/binutils/defparse.c
diff --git a/contrib/binutils/binutils/defparse.h b/x/binutils/binutils/defparse.h
similarity index 100%
rename from contrib/binutils/binutils/defparse.h
rename to x/binutils/binutils/defparse.h
diff --git a/contrib/binutils/binutils/defparse.y b/x/binutils/binutils/defparse.y
similarity index 100%
rename from contrib/binutils/binutils/defparse.y
rename to x/binutils/binutils/defparse.y
diff --git a/contrib/binutils/binutils/dep-in.sed b/x/binutils/binutils/dep-in.sed
similarity index 100%
rename from contrib/binutils/binutils/dep-in.sed
rename to x/binutils/binutils/dep-in.sed
diff --git a/contrib/binutils/binutils/dlltool.c b/x/binutils/binutils/dlltool.c
similarity index 100%
rename from contrib/binutils/binutils/dlltool.c
rename to x/binutils/binutils/dlltool.c
diff --git a/contrib/binutils/binutils/dlltool.h b/x/binutils/binutils/dlltool.h
similarity index 100%
rename from contrib/binutils/binutils/dlltool.h
rename to x/binutils/binutils/dlltool.h
diff --git a/contrib/binutils/binutils/dllwrap.c b/x/binutils/binutils/dllwrap.c
similarity index 100%
rename from contrib/binutils/binutils/dllwrap.c
rename to x/binutils/binutils/dllwrap.c
diff --git a/contrib/binutils/binutils/doc/Makefile.am b/x/binutils/binutils/doc/Makefile.am
similarity index 100%
rename from contrib/binutils/binutils/doc/Makefile.am
rename to x/binutils/binutils/doc/Makefile.am
diff --git a/contrib/binutils/binutils/doc/Makefile.in b/x/binutils/binutils/doc/Makefile.in
similarity index 100%
rename from contrib/binutils/binutils/doc/Makefile.in
rename to x/binutils/binutils/doc/Makefile.in
diff --git a/contrib/binutils/binutils/doc/addr2line.1 b/x/binutils/binutils/doc/addr2line.1
similarity index 100%
rename from contrib/binutils/binutils/doc/addr2line.1
rename to x/binutils/binutils/doc/addr2line.1
diff --git a/contrib/binutils/binutils/doc/ar.1 b/x/binutils/binutils/doc/ar.1
similarity index 100%
rename from contrib/binutils/binutils/doc/ar.1
rename to x/binutils/binutils/doc/ar.1
diff --git a/contrib/binutils/binutils/doc/binutils.texi b/x/binutils/binutils/doc/binutils.texi
similarity index 100%
rename from contrib/binutils/binutils/doc/binutils.texi
rename to x/binutils/binutils/doc/binutils.texi
diff --git a/contrib/binutils/binutils/doc/cxxfilt.man b/x/binutils/binutils/doc/cxxfilt.man
similarity index 100%
rename from contrib/binutils/binutils/doc/cxxfilt.man
rename to x/binutils/binutils/doc/cxxfilt.man
diff --git a/contrib/binutils/binutils/doc/dlltool.1 b/x/binutils/binutils/doc/dlltool.1
similarity index 100%
rename from contrib/binutils/binutils/doc/dlltool.1
rename to x/binutils/binutils/doc/dlltool.1
diff --git a/contrib/binutils/binutils/doc/fdl.texi b/x/binutils/binutils/doc/fdl.texi
similarity index 100%
rename from contrib/binutils/binutils/doc/fdl.texi
rename to x/binutils/binutils/doc/fdl.texi
diff --git a/contrib/binutils/binutils/doc/nm.1 b/x/binutils/binutils/doc/nm.1
similarity index 100%
rename from contrib/binutils/binutils/doc/nm.1
rename to x/binutils/binutils/doc/nm.1
diff --git a/contrib/binutils/binutils/doc/objcopy.1 b/x/binutils/binutils/doc/objcopy.1
similarity index 100%
rename from contrib/binutils/binutils/doc/objcopy.1
rename to x/binutils/binutils/doc/objcopy.1
diff --git a/contrib/binutils/binutils/doc/objdump.1 b/x/binutils/binutils/doc/objdump.1
similarity index 100%
rename from contrib/binutils/binutils/doc/objdump.1
rename to x/binutils/binutils/doc/objdump.1
diff --git a/contrib/binutils/binutils/doc/ranlib.1 b/x/binutils/binutils/doc/ranlib.1
similarity index 100%
rename from contrib/binutils/binutils/doc/ranlib.1
rename to x/binutils/binutils/doc/ranlib.1
diff --git a/contrib/binutils/binutils/doc/readelf.1 b/x/binutils/binutils/doc/readelf.1
similarity index 100%
rename from contrib/binutils/binutils/doc/readelf.1
rename to x/binutils/binutils/doc/readelf.1
diff --git a/contrib/binutils/binutils/doc/size.1 b/x/binutils/binutils/doc/size.1
similarity index 100%
rename from contrib/binutils/binutils/doc/size.1
rename to x/binutils/binutils/doc/size.1
diff --git a/contrib/binutils/binutils/doc/strings.1 b/x/binutils/binutils/doc/strings.1
similarity index 100%
rename from contrib/binutils/binutils/doc/strings.1
rename to x/binutils/binutils/doc/strings.1
diff --git a/contrib/binutils/binutils/doc/strip.1 b/x/binutils/binutils/doc/strip.1
similarity index 100%
rename from contrib/binutils/binutils/doc/strip.1
rename to x/binutils/binutils/doc/strip.1
diff --git a/contrib/binutils/binutils/dyn-string.c b/x/binutils/binutils/dyn-string.c
similarity index 100%
rename from contrib/binutils/binutils/dyn-string.c
rename to x/binutils/binutils/dyn-string.c
diff --git a/contrib/binutils/binutils/dyn-string.h b/x/binutils/binutils/dyn-string.h
similarity index 100%
rename from contrib/binutils/binutils/dyn-string.h
rename to x/binutils/binutils/dyn-string.h
diff --git a/contrib/binutils/binutils/emul_vanilla.c b/x/binutils/binutils/emul_vanilla.c
similarity index 100%
rename from contrib/binutils/binutils/emul_vanilla.c
rename to x/binutils/binutils/emul_vanilla.c
diff --git a/contrib/binutils/binutils/filemode.c b/x/binutils/binutils/filemode.c
similarity index 100%
rename from contrib/binutils/binutils/filemode.c
rename to x/binutils/binutils/filemode.c
diff --git a/contrib/binutils/binutils/ieee.c b/x/binutils/binutils/ieee.c
similarity index 100%
rename from contrib/binutils/binutils/ieee.c
rename to x/binutils/binutils/ieee.c
diff --git a/contrib/binutils/binutils/is-ranlib.c b/x/binutils/binutils/is-ranlib.c
similarity index 100%
rename from contrib/binutils/binutils/is-ranlib.c
rename to x/binutils/binutils/is-ranlib.c
diff --git a/contrib/binutils/binutils/is-strip.c b/x/binutils/binutils/is-strip.c
similarity index 100%
rename from contrib/binutils/binutils/is-strip.c
rename to x/binutils/binutils/is-strip.c
diff --git a/contrib/binutils/binutils/maybe-ranlib.c b/x/binutils/binutils/maybe-ranlib.c
similarity index 100%
rename from contrib/binutils/binutils/maybe-ranlib.c
rename to x/binutils/binutils/maybe-ranlib.c
diff --git a/contrib/binutils/binutils/maybe-strip.c b/x/binutils/binutils/maybe-strip.c
similarity index 100%
rename from contrib/binutils/binutils/maybe-strip.c
rename to x/binutils/binutils/maybe-strip.c
diff --git a/contrib/binutils/binutils/nm.1 b/x/binutils/binutils/nm.1
similarity index 100%
rename from contrib/binutils/binutils/nm.1
rename to x/binutils/binutils/nm.1
diff --git a/contrib/binutils/binutils/nm.c b/x/binutils/binutils/nm.c
similarity index 100%
rename from contrib/binutils/binutils/nm.c
rename to x/binutils/binutils/nm.c
diff --git a/contrib/binutils/binutils/not-ranlib.c b/x/binutils/binutils/not-ranlib.c
similarity index 100%
rename from contrib/binutils/binutils/not-ranlib.c
rename to x/binutils/binutils/not-ranlib.c
diff --git a/contrib/binutils/binutils/not-strip.c b/x/binutils/binutils/not-strip.c
similarity index 100%
rename from contrib/binutils/binutils/not-strip.c
rename to x/binutils/binutils/not-strip.c
diff --git a/contrib/binutils/binutils/objcopy.1 b/x/binutils/binutils/objcopy.1
similarity index 100%
rename from contrib/binutils/binutils/objcopy.1
rename to x/binutils/binutils/objcopy.1
diff --git a/contrib/binutils/binutils/objcopy.c b/x/binutils/binutils/objcopy.c
similarity index 100%
rename from contrib/binutils/binutils/objcopy.c
rename to x/binutils/binutils/objcopy.c
diff --git a/contrib/binutils/binutils/objdump.1 b/x/binutils/binutils/objdump.1
similarity index 100%
rename from contrib/binutils/binutils/objdump.1
rename to x/binutils/binutils/objdump.1
diff --git a/contrib/binutils/binutils/objdump.c b/x/binutils/binutils/objdump.c
similarity index 100%
rename from contrib/binutils/binutils/objdump.c
rename to x/binutils/binutils/objdump.c
diff --git a/contrib/binutils/binutils/po/Make-in b/x/binutils/binutils/po/Make-in
similarity index 100%
rename from contrib/binutils/binutils/po/Make-in
rename to x/binutils/binutils/po/Make-in
diff --git a/contrib/binutils/binutils/po/POTFILES.in b/x/binutils/binutils/po/POTFILES.in
similarity index 100%
rename from contrib/binutils/binutils/po/POTFILES.in
rename to x/binutils/binutils/po/POTFILES.in
diff --git a/contrib/binutils/binutils/po/binutils.pot b/x/binutils/binutils/po/binutils.pot
similarity index 100%
rename from contrib/binutils/binutils/po/binutils.pot
rename to x/binutils/binutils/po/binutils.pot
diff --git a/contrib/binutils/binutils/prdbg.c b/x/binutils/binutils/prdbg.c
similarity index 100%
rename from contrib/binutils/binutils/prdbg.c
rename to x/binutils/binutils/prdbg.c
diff --git a/contrib/binutils/binutils/ranlib.1 b/x/binutils/binutils/ranlib.1
similarity index 100%
rename from contrib/binutils/binutils/ranlib.1
rename to x/binutils/binutils/ranlib.1
diff --git a/contrib/binutils/binutils/ranlib.sh b/x/binutils/binutils/ranlib.sh
similarity index 100%
rename from contrib/binutils/binutils/ranlib.sh
rename to x/binutils/binutils/ranlib.sh
diff --git a/contrib/binutils/binutils/rclex.c b/x/binutils/binutils/rclex.c
similarity index 100%
rename from contrib/binutils/binutils/rclex.c
rename to x/binutils/binutils/rclex.c
diff --git a/contrib/binutils/binutils/rclex.l b/x/binutils/binutils/rclex.l
similarity index 100%
rename from contrib/binutils/binutils/rclex.l
rename to x/binutils/binutils/rclex.l
diff --git a/contrib/binutils/binutils/rcparse.c b/x/binutils/binutils/rcparse.c
similarity index 100%
rename from contrib/binutils/binutils/rcparse.c
rename to x/binutils/binutils/rcparse.c
diff --git a/contrib/binutils/binutils/rcparse.h b/x/binutils/binutils/rcparse.h
similarity index 100%
rename from contrib/binutils/binutils/rcparse.h
rename to x/binutils/binutils/rcparse.h
diff --git a/contrib/binutils/binutils/rcparse.y b/x/binutils/binutils/rcparse.y
similarity index 100%
rename from contrib/binutils/binutils/rcparse.y
rename to x/binutils/binutils/rcparse.y
diff --git a/contrib/binutils/binutils/rdcoff.c b/x/binutils/binutils/rdcoff.c
similarity index 100%
rename from contrib/binutils/binutils/rdcoff.c
rename to x/binutils/binutils/rdcoff.c
diff --git a/contrib/binutils/binutils/rddbg.c b/x/binutils/binutils/rddbg.c
similarity index 100%
rename from contrib/binutils/binutils/rddbg.c
rename to x/binutils/binutils/rddbg.c
diff --git a/contrib/binutils/binutils/readelf.1 b/x/binutils/binutils/readelf.1
similarity index 100%
rename from contrib/binutils/binutils/readelf.1
rename to x/binutils/binutils/readelf.1
diff --git a/contrib/binutils/binutils/readelf.c b/x/binutils/binutils/readelf.c
similarity index 100%
rename from contrib/binutils/binutils/readelf.c
rename to x/binutils/binutils/readelf.c
diff --git a/contrib/binutils/binutils/rename.c b/x/binutils/binutils/rename.c
similarity index 100%
rename from contrib/binutils/binutils/rename.c
rename to x/binutils/binutils/rename.c
diff --git a/contrib/binutils/binutils/resbin.c b/x/binutils/binutils/resbin.c
similarity index 100%
rename from contrib/binutils/binutils/resbin.c
rename to x/binutils/binutils/resbin.c
diff --git a/contrib/binutils/binutils/rescoff.c b/x/binutils/binutils/rescoff.c
similarity index 100%
rename from contrib/binutils/binutils/rescoff.c
rename to x/binutils/binutils/rescoff.c
diff --git a/contrib/binutils/binutils/resrc.c b/x/binutils/binutils/resrc.c
similarity index 100%
rename from contrib/binutils/binutils/resrc.c
rename to x/binutils/binutils/resrc.c
diff --git a/contrib/binutils/binutils/resres.c b/x/binutils/binutils/resres.c
similarity index 100%
rename from contrib/binutils/binutils/resres.c
rename to x/binutils/binutils/resres.c
diff --git a/contrib/binutils/binutils/sanity.sh b/x/binutils/binutils/sanity.sh
similarity index 100%
rename from contrib/binutils/binutils/sanity.sh
rename to x/binutils/binutils/sanity.sh
diff --git a/contrib/binutils/binutils/size.1 b/x/binutils/binutils/size.1
similarity index 100%
rename from contrib/binutils/binutils/size.1
rename to x/binutils/binutils/size.1
diff --git a/contrib/binutils/binutils/size.c b/x/binutils/binutils/size.c
similarity index 100%
rename from contrib/binutils/binutils/size.c
rename to x/binutils/binutils/size.c
diff --git a/contrib/binutils/binutils/srconv.c b/x/binutils/binutils/srconv.c
similarity index 100%
rename from contrib/binutils/binutils/srconv.c
rename to x/binutils/binutils/srconv.c
diff --git a/contrib/binutils/binutils/stabs.c b/x/binutils/binutils/stabs.c
similarity index 100%
rename from contrib/binutils/binutils/stabs.c
rename to x/binutils/binutils/stabs.c
diff --git a/contrib/binutils/binutils/stamp-h.in b/x/binutils/binutils/stamp-h.in
similarity index 100%
rename from contrib/binutils/binutils/stamp-h.in
rename to x/binutils/binutils/stamp-h.in
diff --git a/contrib/binutils/binutils/strings.1 b/x/binutils/binutils/strings.1
similarity index 100%
rename from contrib/binutils/binutils/strings.1
rename to x/binutils/binutils/strings.1
diff --git a/contrib/binutils/binutils/strings.c b/x/binutils/binutils/strings.c
similarity index 100%
rename from contrib/binutils/binutils/strings.c
rename to x/binutils/binutils/strings.c
diff --git a/contrib/binutils/binutils/strip.1 b/x/binutils/binutils/strip.1
similarity index 100%
rename from contrib/binutils/binutils/strip.1
rename to x/binutils/binutils/strip.1
diff --git a/contrib/binutils/binutils/sysdump.c b/x/binutils/binutils/sysdump.c
similarity index 100%
rename from contrib/binutils/binutils/sysdump.c
rename to x/binutils/binutils/sysdump.c
diff --git a/contrib/binutils/binutils/sysinfo.y b/x/binutils/binutils/sysinfo.y
similarity index 100%
rename from contrib/binutils/binutils/sysinfo.y
rename to x/binutils/binutils/sysinfo.y
diff --git a/contrib/binutils/binutils/syslex.l b/x/binutils/binutils/syslex.l
similarity index 100%
rename from contrib/binutils/binutils/syslex.l
rename to x/binutils/binutils/syslex.l
diff --git a/contrib/binutils/binutils/unwind-ia64.c b/x/binutils/binutils/unwind-ia64.c
similarity index 100%
rename from contrib/binutils/binutils/unwind-ia64.c
rename to x/binutils/binutils/unwind-ia64.c
diff --git a/contrib/binutils/binutils/unwind-ia64.h b/x/binutils/binutils/unwind-ia64.h
similarity index 100%
rename from contrib/binutils/binutils/unwind-ia64.h
rename to x/binutils/binutils/unwind-ia64.h
diff --git a/contrib/binutils/binutils/version.c b/x/binutils/binutils/version.c
similarity index 100%
rename from contrib/binutils/binutils/version.c
rename to x/binutils/binutils/version.c
diff --git a/contrib/binutils/binutils/wrstabs.c b/x/binutils/binutils/wrstabs.c
similarity index 100%
rename from contrib/binutils/binutils/wrstabs.c
rename to x/binutils/binutils/wrstabs.c
diff --git a/contrib/binutils/config-ml.in b/x/binutils/config-ml.in
similarity index 100%
rename from contrib/binutils/config-ml.in
rename to x/binutils/config-ml.in
diff --git a/contrib/binutils/config.guess b/x/binutils/config.guess
similarity index 100%
rename from contrib/binutils/config.guess
rename to x/binutils/config.guess
diff --git a/contrib/binutils/config.if b/x/binutils/config.if
similarity index 100%
rename from contrib/binutils/config.if
rename to x/binutils/config.if
diff --git a/contrib/binutils/config.sub b/x/binutils/config.sub
similarity index 100%
rename from contrib/binutils/config.sub
rename to x/binutils/config.sub
diff --git a/contrib/binutils/config/ChangeLog b/x/binutils/config/ChangeLog
similarity index 100%
rename from contrib/binutils/config/ChangeLog
rename to x/binutils/config/ChangeLog
diff --git a/contrib/binutils/config/acinclude.m4 b/x/binutils/config/acinclude.m4
similarity index 100%
rename from contrib/binutils/config/acinclude.m4
rename to x/binutils/config/acinclude.m4
diff --git a/contrib/binutils/config/mh-armpic b/x/binutils/config/mh-armpic
similarity index 100%
rename from contrib/binutils/config/mh-armpic
rename to x/binutils/config/mh-armpic
diff --git a/contrib/binutils/config/mh-cxux b/x/binutils/config/mh-cxux
similarity index 100%
rename from contrib/binutils/config/mh-cxux
rename to x/binutils/config/mh-cxux
diff --git a/contrib/binutils/config/mh-decstation b/x/binutils/config/mh-decstation
similarity index 100%
rename from contrib/binutils/config/mh-decstation
rename to x/binutils/config/mh-decstation
diff --git a/contrib/binutils/config/mh-elfalphapic b/x/binutils/config/mh-elfalphapic
similarity index 100%
rename from contrib/binutils/config/mh-elfalphapic
rename to x/binutils/config/mh-elfalphapic
diff --git a/contrib/binutils/config/mh-ia64pic b/x/binutils/config/mh-ia64pic
similarity index 100%
rename from contrib/binutils/config/mh-ia64pic
rename to x/binutils/config/mh-ia64pic
diff --git a/contrib/binutils/config/mh-mingw32 b/x/binutils/config/mh-mingw32
similarity index 100%
rename from contrib/binutils/config/mh-mingw32
rename to x/binutils/config/mh-mingw32
diff --git a/contrib/binutils/config/mh-necv4 b/x/binutils/config/mh-necv4
similarity index 100%
rename from contrib/binutils/config/mh-necv4
rename to x/binutils/config/mh-necv4
diff --git a/contrib/binutils/config/mh-openedition b/x/binutils/config/mh-openedition
similarity index 100%
rename from contrib/binutils/config/mh-openedition
rename to x/binutils/config/mh-openedition
diff --git a/contrib/binutils/config/mh-papic b/x/binutils/config/mh-papic
similarity index 100%
rename from contrib/binutils/config/mh-papic
rename to x/binutils/config/mh-papic
diff --git a/contrib/binutils/config/mh-ppcpic b/x/binutils/config/mh-ppcpic
similarity index 100%
rename from contrib/binutils/config/mh-ppcpic
rename to x/binutils/config/mh-ppcpic
diff --git a/contrib/binutils/config/mh-s390pic b/x/binutils/config/mh-s390pic
similarity index 100%
rename from contrib/binutils/config/mh-s390pic
rename to x/binutils/config/mh-s390pic
diff --git a/contrib/binutils/config/mh-sco b/x/binutils/config/mh-sco
similarity index 100%
rename from contrib/binutils/config/mh-sco
rename to x/binutils/config/mh-sco
diff --git a/contrib/binutils/config/mh-solaris b/x/binutils/config/mh-solaris
similarity index 100%
rename from contrib/binutils/config/mh-solaris
rename to x/binutils/config/mh-solaris
diff --git a/contrib/binutils/config/mh-sparcpic b/x/binutils/config/mh-sparcpic
similarity index 100%
rename from contrib/binutils/config/mh-sparcpic
rename to x/binutils/config/mh-sparcpic
diff --git a/contrib/binutils/config/mh-sysv b/x/binutils/config/mh-sysv
similarity index 100%
rename from contrib/binutils/config/mh-sysv
rename to x/binutils/config/mh-sysv
diff --git a/contrib/binutils/config/mh-sysv4 b/x/binutils/config/mh-sysv4
similarity index 100%
rename from contrib/binutils/config/mh-sysv4
rename to x/binutils/config/mh-sysv4
diff --git a/contrib/binutils/config/mh-sysv5 b/x/binutils/config/mh-sysv5
similarity index 100%
rename from contrib/binutils/config/mh-sysv5
rename to x/binutils/config/mh-sysv5
diff --git a/contrib/binutils/config/mh-x86pic b/x/binutils/config/mh-x86pic
similarity index 100%
rename from contrib/binutils/config/mh-x86pic
rename to x/binutils/config/mh-x86pic
diff --git a/contrib/binutils/config/mt-alphaieee b/x/binutils/config/mt-alphaieee
similarity index 100%
rename from contrib/binutils/config/mt-alphaieee
rename to x/binutils/config/mt-alphaieee
diff --git a/contrib/binutils/config/mt-armpic b/x/binutils/config/mt-armpic
similarity index 100%
rename from contrib/binutils/config/mt-armpic
rename to x/binutils/config/mt-armpic
diff --git a/contrib/binutils/config/mt-elfalphapic b/x/binutils/config/mt-elfalphapic
similarity index 100%
rename from contrib/binutils/config/mt-elfalphapic
rename to x/binutils/config/mt-elfalphapic
diff --git a/contrib/binutils/config/mt-ia64pic b/x/binutils/config/mt-ia64pic
similarity index 100%
rename from contrib/binutils/config/mt-ia64pic
rename to x/binutils/config/mt-ia64pic
diff --git a/contrib/binutils/config/mt-linux b/x/binutils/config/mt-linux
similarity index 100%
rename from contrib/binutils/config/mt-linux
rename to x/binutils/config/mt-linux
diff --git a/contrib/binutils/config/mt-ospace b/x/binutils/config/mt-ospace
similarity index 100%
rename from contrib/binutils/config/mt-ospace
rename to x/binutils/config/mt-ospace
diff --git a/contrib/binutils/config/mt-papic b/x/binutils/config/mt-papic
similarity index 100%
rename from contrib/binutils/config/mt-papic
rename to x/binutils/config/mt-papic
diff --git a/contrib/binutils/config/mt-ppcpic b/x/binutils/config/mt-ppcpic
similarity index 100%
rename from contrib/binutils/config/mt-ppcpic
rename to x/binutils/config/mt-ppcpic
diff --git a/contrib/binutils/config/mt-s390pic b/x/binutils/config/mt-s390pic
similarity index 100%
rename from contrib/binutils/config/mt-s390pic
rename to x/binutils/config/mt-s390pic
diff --git a/contrib/binutils/config/mt-sparcpic b/x/binutils/config/mt-sparcpic
similarity index 100%
rename from contrib/binutils/config/mt-sparcpic
rename to x/binutils/config/mt-sparcpic
diff --git a/contrib/binutils/config/mt-v810 b/x/binutils/config/mt-v810
similarity index 100%
rename from contrib/binutils/config/mt-v810
rename to x/binutils/config/mt-v810
diff --git a/contrib/binutils/config/mt-x86pic b/x/binutils/config/mt-x86pic
similarity index 100%
rename from contrib/binutils/config/mt-x86pic
rename to x/binutils/config/mt-x86pic
diff --git a/contrib/binutils/configure b/x/binutils/configure
similarity index 100%
rename from contrib/binutils/configure
rename to x/binutils/configure
diff --git a/contrib/binutils/configure.in b/x/binutils/configure.in
similarity index 100%
rename from contrib/binutils/configure.in
rename to x/binutils/configure.in
diff --git a/contrib/binutils/contrib/ChangeLog b/x/binutils/contrib/ChangeLog
similarity index 100%
rename from contrib/binutils/contrib/ChangeLog
rename to x/binutils/contrib/ChangeLog
diff --git a/contrib/binutils/contrib/texi2pod.pl b/x/binutils/contrib/texi2pod.pl
similarity index 100%
rename from contrib/binutils/contrib/texi2pod.pl
rename to x/binutils/contrib/texi2pod.pl
diff --git a/contrib/binutils/etc/ChangeLog b/x/binutils/etc/ChangeLog
similarity index 100%
rename from contrib/binutils/etc/ChangeLog
rename to x/binutils/etc/ChangeLog
diff --git a/contrib/binutils/etc/Makefile.in b/x/binutils/etc/Makefile.in
similarity index 100%
rename from contrib/binutils/etc/Makefile.in
rename to x/binutils/etc/Makefile.in
diff --git a/contrib/binutils/etc/add-log.el b/x/binutils/etc/add-log.el
similarity index 100%
rename from contrib/binutils/etc/add-log.el
rename to x/binutils/etc/add-log.el
diff --git a/contrib/binutils/etc/add-log.vi b/x/binutils/etc/add-log.vi
similarity index 100%
rename from contrib/binutils/etc/add-log.vi
rename to x/binutils/etc/add-log.vi
diff --git a/contrib/binutils/etc/cfg-paper.texi b/x/binutils/etc/cfg-paper.texi
similarity index 100%
rename from contrib/binutils/etc/cfg-paper.texi
rename to x/binutils/etc/cfg-paper.texi
diff --git a/contrib/binutils/etc/configbuild.ein b/x/binutils/etc/configbuild.ein
similarity index 100%
rename from contrib/binutils/etc/configbuild.ein
rename to x/binutils/etc/configbuild.ein
diff --git a/contrib/binutils/etc/configbuild.fig b/x/binutils/etc/configbuild.fig
similarity index 100%
rename from contrib/binutils/etc/configbuild.fig
rename to x/binutils/etc/configbuild.fig
diff --git a/contrib/binutils/etc/configbuild.jin b/x/binutils/etc/configbuild.jin
similarity index 100%
rename from contrib/binutils/etc/configbuild.jin
rename to x/binutils/etc/configbuild.jin
diff --git a/contrib/binutils/etc/configbuild.tin b/x/binutils/etc/configbuild.tin
similarity index 100%
rename from contrib/binutils/etc/configbuild.tin
rename to x/binutils/etc/configbuild.tin
diff --git a/contrib/binutils/etc/configdev.ein b/x/binutils/etc/configdev.ein
similarity index 100%
rename from contrib/binutils/etc/configdev.ein
rename to x/binutils/etc/configdev.ein
diff --git a/contrib/binutils/etc/configdev.fig b/x/binutils/etc/configdev.fig
similarity index 100%
rename from contrib/binutils/etc/configdev.fig
rename to x/binutils/etc/configdev.fig
diff --git a/contrib/binutils/etc/configdev.jin b/x/binutils/etc/configdev.jin
similarity index 100%
rename from contrib/binutils/etc/configdev.jin
rename to x/binutils/etc/configdev.jin
diff --git a/contrib/binutils/etc/configdev.tin b/x/binutils/etc/configdev.tin
similarity index 100%
rename from contrib/binutils/etc/configdev.tin
rename to x/binutils/etc/configdev.tin
diff --git a/contrib/binutils/etc/configure b/x/binutils/etc/configure
similarity index 100%
rename from contrib/binutils/etc/configure
rename to x/binutils/etc/configure
diff --git a/contrib/binutils/etc/configure.in b/x/binutils/etc/configure.in
similarity index 100%
rename from contrib/binutils/etc/configure.in
rename to x/binutils/etc/configure.in
diff --git a/contrib/binutils/etc/configure.man b/x/binutils/etc/configure.man
similarity index 100%
rename from contrib/binutils/etc/configure.man
rename to x/binutils/etc/configure.man
diff --git a/contrib/binutils/etc/configure.texi b/x/binutils/etc/configure.texi
similarity index 100%
rename from contrib/binutils/etc/configure.texi
rename to x/binutils/etc/configure.texi
diff --git a/contrib/binutils/etc/make-stds.texi b/x/binutils/etc/make-stds.texi
similarity index 100%
rename from contrib/binutils/etc/make-stds.texi
rename to x/binutils/etc/make-stds.texi
diff --git a/contrib/binutils/etc/standards.texi b/x/binutils/etc/standards.texi
similarity index 100%
rename from contrib/binutils/etc/standards.texi
rename to x/binutils/etc/standards.texi
diff --git a/contrib/binutils/gas/CONTRIBUTORS b/x/binutils/gas/CONTRIBUTORS
similarity index 100%
rename from contrib/binutils/gas/CONTRIBUTORS
rename to x/binutils/gas/CONTRIBUTORS
diff --git a/contrib/binutils/gas/ChangeLog b/x/binutils/gas/ChangeLog
similarity index 100%
rename from contrib/binutils/gas/ChangeLog
rename to x/binutils/gas/ChangeLog
diff --git a/contrib/binutils/gas/ChangeLog-0001 b/x/binutils/gas/ChangeLog-0001
similarity index 100%
rename from contrib/binutils/gas/ChangeLog-0001
rename to x/binutils/gas/ChangeLog-0001
diff --git a/contrib/binutils/gas/ChangeLog-0203 b/x/binutils/gas/ChangeLog-0203
similarity index 100%
rename from contrib/binutils/gas/ChangeLog-0203
rename to x/binutils/gas/ChangeLog-0203
diff --git a/contrib/binutils/gas/ChangeLog-9295 b/x/binutils/gas/ChangeLog-9295
similarity index 100%
rename from contrib/binutils/gas/ChangeLog-9295
rename to x/binutils/gas/ChangeLog-9295
diff --git a/contrib/binutils/gas/ChangeLog-9697 b/x/binutils/gas/ChangeLog-9697
similarity index 100%
rename from contrib/binutils/gas/ChangeLog-9697
rename to x/binutils/gas/ChangeLog-9697
diff --git a/contrib/binutils/gas/ChangeLog-9899 b/x/binutils/gas/ChangeLog-9899
similarity index 100%
rename from contrib/binutils/gas/ChangeLog-9899
rename to x/binutils/gas/ChangeLog-9899
diff --git a/contrib/binutils/gas/MAINTAINERS b/x/binutils/gas/MAINTAINERS
similarity index 100%
rename from contrib/binutils/gas/MAINTAINERS
rename to x/binutils/gas/MAINTAINERS
diff --git a/contrib/binutils/gas/Makefile.am b/x/binutils/gas/Makefile.am
similarity index 100%
rename from contrib/binutils/gas/Makefile.am
rename to x/binutils/gas/Makefile.am
diff --git a/contrib/binutils/gas/Makefile.in b/x/binutils/gas/Makefile.in
similarity index 100%
rename from contrib/binutils/gas/Makefile.in
rename to x/binutils/gas/Makefile.in
diff --git a/contrib/binutils/gas/NEWS b/x/binutils/gas/NEWS
similarity index 100%
rename from contrib/binutils/gas/NEWS
rename to x/binutils/gas/NEWS
diff --git a/contrib/binutils/gas/README b/x/binutils/gas/README
similarity index 100%
rename from contrib/binutils/gas/README
rename to x/binutils/gas/README
diff --git a/contrib/binutils/gas/acconfig.h b/x/binutils/gas/acconfig.h
similarity index 100%
rename from contrib/binutils/gas/acconfig.h
rename to x/binutils/gas/acconfig.h
diff --git a/contrib/binutils/gas/acinclude.m4 b/x/binutils/gas/acinclude.m4
similarity index 100%
rename from contrib/binutils/gas/acinclude.m4
rename to x/binutils/gas/acinclude.m4
diff --git a/contrib/binutils/gas/aclocal.m4 b/x/binutils/gas/aclocal.m4
similarity index 100%
rename from contrib/binutils/gas/aclocal.m4
rename to x/binutils/gas/aclocal.m4
diff --git a/contrib/binutils/gas/app.c b/x/binutils/gas/app.c
similarity index 100%
rename from contrib/binutils/gas/app.c
rename to x/binutils/gas/app.c
diff --git a/contrib/binutils/gas/as.c b/x/binutils/gas/as.c
similarity index 100%
rename from contrib/binutils/gas/as.c
rename to x/binutils/gas/as.c
diff --git a/contrib/binutils/gas/as.h b/x/binutils/gas/as.h
similarity index 100%
rename from contrib/binutils/gas/as.h
rename to x/binutils/gas/as.h
diff --git a/contrib/binutils/gas/asintl.h b/x/binutils/gas/asintl.h
similarity index 100%
rename from contrib/binutils/gas/asintl.h
rename to x/binutils/gas/asintl.h
diff --git a/contrib/binutils/gas/atof-generic.c b/x/binutils/gas/atof-generic.c
similarity index 100%
rename from contrib/binutils/gas/atof-generic.c
rename to x/binutils/gas/atof-generic.c
diff --git a/contrib/binutils/gas/bignum-copy.c b/x/binutils/gas/bignum-copy.c
similarity index 100%
rename from contrib/binutils/gas/bignum-copy.c
rename to x/binutils/gas/bignum-copy.c
diff --git a/contrib/binutils/gas/bignum.h b/x/binutils/gas/bignum.h
similarity index 100%
rename from contrib/binutils/gas/bignum.h
rename to x/binutils/gas/bignum.h
diff --git a/contrib/binutils/gas/bit_fix.h b/x/binutils/gas/bit_fix.h
similarity index 100%
rename from contrib/binutils/gas/bit_fix.h
rename to x/binutils/gas/bit_fix.h
diff --git a/contrib/binutils/gas/cgen.c b/x/binutils/gas/cgen.c
similarity index 100%
rename from contrib/binutils/gas/cgen.c
rename to x/binutils/gas/cgen.c
diff --git a/contrib/binutils/gas/cgen.h b/x/binutils/gas/cgen.h
similarity index 100%
rename from contrib/binutils/gas/cgen.h
rename to x/binutils/gas/cgen.h
diff --git a/contrib/binutils/gas/cond.c b/x/binutils/gas/cond.c
similarity index 100%
rename from contrib/binutils/gas/cond.c
rename to x/binutils/gas/cond.c
diff --git a/contrib/binutils/gas/conf.in b/x/binutils/gas/conf.in
similarity index 100%
rename from contrib/binutils/gas/conf.in
rename to x/binutils/gas/conf.in
diff --git a/contrib/binutils/gas/config.in b/x/binutils/gas/config.in
similarity index 100%
rename from contrib/binutils/gas/config.in
rename to x/binutils/gas/config.in
diff --git a/contrib/binutils/gas/config/aout_gnu.h b/x/binutils/gas/config/aout_gnu.h
similarity index 100%
rename from contrib/binutils/gas/config/aout_gnu.h
rename to x/binutils/gas/config/aout_gnu.h
diff --git a/contrib/binutils/gas/config/atof-ieee.c b/x/binutils/gas/config/atof-ieee.c
similarity index 100%
rename from contrib/binutils/gas/config/atof-ieee.c
rename to x/binutils/gas/config/atof-ieee.c
diff --git a/contrib/binutils/gas/config/atof-vax.c b/x/binutils/gas/config/atof-vax.c
similarity index 100%
rename from contrib/binutils/gas/config/atof-vax.c
rename to x/binutils/gas/config/atof-vax.c
diff --git a/contrib/binutils/gas/config/e-i386aout.c b/x/binutils/gas/config/e-i386aout.c
similarity index 100%
rename from contrib/binutils/gas/config/e-i386aout.c
rename to x/binutils/gas/config/e-i386aout.c
diff --git a/contrib/binutils/gas/config/e-i386coff.c b/x/binutils/gas/config/e-i386coff.c
similarity index 100%
rename from contrib/binutils/gas/config/e-i386coff.c
rename to x/binutils/gas/config/e-i386coff.c
diff --git a/contrib/binutils/gas/config/e-i386elf.c b/x/binutils/gas/config/e-i386elf.c
similarity index 100%
rename from contrib/binutils/gas/config/e-i386elf.c
rename to x/binutils/gas/config/e-i386elf.c
diff --git a/contrib/binutils/gas/config/e-mipsecoff.c b/x/binutils/gas/config/e-mipsecoff.c
similarity index 100%
rename from contrib/binutils/gas/config/e-mipsecoff.c
rename to x/binutils/gas/config/e-mipsecoff.c
diff --git a/contrib/binutils/gas/config/e-mipself.c b/x/binutils/gas/config/e-mipself.c
similarity index 100%
rename from contrib/binutils/gas/config/e-mipself.c
rename to x/binutils/gas/config/e-mipself.c
diff --git a/contrib/binutils/gas/config/i386coff.mt b/x/binutils/gas/config/i386coff.mt
similarity index 100%
rename from contrib/binutils/gas/config/i386coff.mt
rename to x/binutils/gas/config/i386coff.mt
diff --git a/contrib/binutils/gas/config/itbl-mips.h b/x/binutils/gas/config/itbl-mips.h
similarity index 100%
rename from contrib/binutils/gas/config/itbl-mips.h
rename to x/binutils/gas/config/itbl-mips.h
diff --git a/contrib/binutils/gas/config/obj-aout.c b/x/binutils/gas/config/obj-aout.c
similarity index 100%
rename from contrib/binutils/gas/config/obj-aout.c
rename to x/binutils/gas/config/obj-aout.c
diff --git a/contrib/binutils/gas/config/obj-aout.h b/x/binutils/gas/config/obj-aout.h
similarity index 100%
rename from contrib/binutils/gas/config/obj-aout.h
rename to x/binutils/gas/config/obj-aout.h
diff --git a/contrib/binutils/gas/config/obj-coff.c b/x/binutils/gas/config/obj-coff.c
similarity index 100%
rename from contrib/binutils/gas/config/obj-coff.c
rename to x/binutils/gas/config/obj-coff.c
diff --git a/contrib/binutils/gas/config/obj-coff.h b/x/binutils/gas/config/obj-coff.h
similarity index 100%
rename from contrib/binutils/gas/config/obj-coff.h
rename to x/binutils/gas/config/obj-coff.h
diff --git a/contrib/binutils/gas/config/obj-ecoff.c b/x/binutils/gas/config/obj-ecoff.c
similarity index 100%
rename from contrib/binutils/gas/config/obj-ecoff.c
rename to x/binutils/gas/config/obj-ecoff.c
diff --git a/contrib/binutils/gas/config/obj-ecoff.h b/x/binutils/gas/config/obj-ecoff.h
similarity index 100%
rename from contrib/binutils/gas/config/obj-ecoff.h
rename to x/binutils/gas/config/obj-ecoff.h
diff --git a/contrib/binutils/gas/config/obj-elf.c b/x/binutils/gas/config/obj-elf.c
similarity index 100%
rename from contrib/binutils/gas/config/obj-elf.c
rename to x/binutils/gas/config/obj-elf.c
diff --git a/contrib/binutils/gas/config/obj-elf.h b/x/binutils/gas/config/obj-elf.h
similarity index 100%
rename from contrib/binutils/gas/config/obj-elf.h
rename to x/binutils/gas/config/obj-elf.h
diff --git a/contrib/binutils/gas/config/obj-generic.c b/x/binutils/gas/config/obj-generic.c
similarity index 100%
rename from contrib/binutils/gas/config/obj-generic.c
rename to x/binutils/gas/config/obj-generic.c
diff --git a/contrib/binutils/gas/config/obj-generic.h b/x/binutils/gas/config/obj-generic.h
similarity index 100%
rename from contrib/binutils/gas/config/obj-generic.h
rename to x/binutils/gas/config/obj-generic.h
diff --git a/contrib/binutils/gas/config/obj-ieee.c b/x/binutils/gas/config/obj-ieee.c
similarity index 100%
rename from contrib/binutils/gas/config/obj-ieee.c
rename to x/binutils/gas/config/obj-ieee.c
diff --git a/contrib/binutils/gas/config/obj-ieee.h b/x/binutils/gas/config/obj-ieee.h
similarity index 100%
rename from contrib/binutils/gas/config/obj-ieee.h
rename to x/binutils/gas/config/obj-ieee.h
diff --git a/contrib/binutils/gas/config/obj-multi.c b/x/binutils/gas/config/obj-multi.c
similarity index 100%
rename from contrib/binutils/gas/config/obj-multi.c
rename to x/binutils/gas/config/obj-multi.c
diff --git a/contrib/binutils/gas/config/obj-multi.h b/x/binutils/gas/config/obj-multi.h
similarity index 100%
rename from contrib/binutils/gas/config/obj-multi.h
rename to x/binutils/gas/config/obj-multi.h
diff --git a/contrib/binutils/gas/config/sco5.mt b/x/binutils/gas/config/sco5.mt
similarity index 100%
rename from contrib/binutils/gas/config/sco5.mt
rename to x/binutils/gas/config/sco5.mt
diff --git a/contrib/binutils/gas/config/tc-alpha.c b/x/binutils/gas/config/tc-alpha.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-alpha.c
rename to x/binutils/gas/config/tc-alpha.c
diff --git a/contrib/binutils/gas/config/tc-alpha.h b/x/binutils/gas/config/tc-alpha.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-alpha.h
rename to x/binutils/gas/config/tc-alpha.h
diff --git a/contrib/binutils/gas/config/tc-arc.c b/x/binutils/gas/config/tc-arc.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-arc.c
rename to x/binutils/gas/config/tc-arc.c
diff --git a/contrib/binutils/gas/config/tc-arc.h b/x/binutils/gas/config/tc-arc.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-arc.h
rename to x/binutils/gas/config/tc-arc.h
diff --git a/contrib/binutils/gas/config/tc-arm.c b/x/binutils/gas/config/tc-arm.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-arm.c
rename to x/binutils/gas/config/tc-arm.c
diff --git a/contrib/binutils/gas/config/tc-arm.h b/x/binutils/gas/config/tc-arm.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-arm.h
rename to x/binutils/gas/config/tc-arm.h
diff --git a/contrib/binutils/gas/config/tc-generic.c b/x/binutils/gas/config/tc-generic.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-generic.c
rename to x/binutils/gas/config/tc-generic.c
diff --git a/contrib/binutils/gas/config/tc-generic.h b/x/binutils/gas/config/tc-generic.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-generic.h
rename to x/binutils/gas/config/tc-generic.h
diff --git a/contrib/binutils/gas/config/tc-i386.c b/x/binutils/gas/config/tc-i386.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-i386.c
rename to x/binutils/gas/config/tc-i386.c
diff --git a/contrib/binutils/gas/config/tc-i386.h b/x/binutils/gas/config/tc-i386.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-i386.h
rename to x/binutils/gas/config/tc-i386.h
diff --git a/contrib/binutils/gas/config/tc-ia64.c b/x/binutils/gas/config/tc-ia64.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-ia64.c
rename to x/binutils/gas/config/tc-ia64.c
diff --git a/contrib/binutils/gas/config/tc-ia64.h b/x/binutils/gas/config/tc-ia64.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-ia64.h
rename to x/binutils/gas/config/tc-ia64.h
diff --git a/contrib/binutils/gas/config/tc-m68851.h b/x/binutils/gas/config/tc-m68851.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-m68851.h
rename to x/binutils/gas/config/tc-m68851.h
diff --git a/contrib/binutils/gas/config/tc-mips.c b/x/binutils/gas/config/tc-mips.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-mips.c
rename to x/binutils/gas/config/tc-mips.c
diff --git a/contrib/binutils/gas/config/tc-mips.h b/x/binutils/gas/config/tc-mips.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-mips.h
rename to x/binutils/gas/config/tc-mips.h
diff --git a/contrib/binutils/gas/config/tc-ppc.c b/x/binutils/gas/config/tc-ppc.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-ppc.c
rename to x/binutils/gas/config/tc-ppc.c
diff --git a/contrib/binutils/gas/config/tc-ppc.h b/x/binutils/gas/config/tc-ppc.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-ppc.h
rename to x/binutils/gas/config/tc-ppc.h
diff --git a/contrib/binutils/gas/config/tc-s390.c b/x/binutils/gas/config/tc-s390.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-s390.c
rename to x/binutils/gas/config/tc-s390.c
diff --git a/contrib/binutils/gas/config/tc-s390.h b/x/binutils/gas/config/tc-s390.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-s390.h
rename to x/binutils/gas/config/tc-s390.h
diff --git a/contrib/binutils/gas/config/tc-sh.c b/x/binutils/gas/config/tc-sh.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-sh.c
rename to x/binutils/gas/config/tc-sh.c
diff --git a/contrib/binutils/gas/config/tc-sh.h b/x/binutils/gas/config/tc-sh.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-sh.h
rename to x/binutils/gas/config/tc-sh.h
diff --git a/contrib/binutils/gas/config/tc-sparc.c b/x/binutils/gas/config/tc-sparc.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-sparc.c
rename to x/binutils/gas/config/tc-sparc.c
diff --git a/contrib/binutils/gas/config/tc-sparc.h b/x/binutils/gas/config/tc-sparc.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-sparc.h
rename to x/binutils/gas/config/tc-sparc.h
diff --git a/contrib/binutils/gas/config/tc-tic30.c b/x/binutils/gas/config/tc-tic30.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-tic30.c
rename to x/binutils/gas/config/tc-tic30.c
diff --git a/contrib/binutils/gas/config/tc-tic30.h b/x/binutils/gas/config/tc-tic30.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-tic30.h
rename to x/binutils/gas/config/tc-tic30.h
diff --git a/contrib/binutils/gas/config/tc-v850.c b/x/binutils/gas/config/tc-v850.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-v850.c
rename to x/binutils/gas/config/tc-v850.c
diff --git a/contrib/binutils/gas/config/tc-v850.h b/x/binutils/gas/config/tc-v850.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-v850.h
rename to x/binutils/gas/config/tc-v850.h
diff --git a/contrib/binutils/gas/config/tc-z8k.c b/x/binutils/gas/config/tc-z8k.c
similarity index 100%
rename from contrib/binutils/gas/config/tc-z8k.c
rename to x/binutils/gas/config/tc-z8k.c
diff --git a/contrib/binutils/gas/config/tc-z8k.h b/x/binutils/gas/config/tc-z8k.h
similarity index 100%
rename from contrib/binutils/gas/config/tc-z8k.h
rename to x/binutils/gas/config/tc-z8k.h
diff --git a/contrib/binutils/gas/config/te-386bsd.h b/x/binutils/gas/config/te-386bsd.h
similarity index 100%
rename from contrib/binutils/gas/config/te-386bsd.h
rename to x/binutils/gas/config/te-386bsd.h
diff --git a/contrib/binutils/gas/config/te-aux.h b/x/binutils/gas/config/te-aux.h
similarity index 100%
rename from contrib/binutils/gas/config/te-aux.h
rename to x/binutils/gas/config/te-aux.h
diff --git a/contrib/binutils/gas/config/te-freebsd.h b/x/binutils/gas/config/te-freebsd.h
similarity index 100%
rename from contrib/binutils/gas/config/te-freebsd.h
rename to x/binutils/gas/config/te-freebsd.h
diff --git a/contrib/binutils/gas/config/te-generic.h b/x/binutils/gas/config/te-generic.h
similarity index 100%
rename from contrib/binutils/gas/config/te-generic.h
rename to x/binutils/gas/config/te-generic.h
diff --git a/contrib/binutils/gas/config/te-linux.h b/x/binutils/gas/config/te-linux.h
similarity index 100%
rename from contrib/binutils/gas/config/te-linux.h
rename to x/binutils/gas/config/te-linux.h
diff --git a/contrib/binutils/gas/config/te-multi.h b/x/binutils/gas/config/te-multi.h
similarity index 100%
rename from contrib/binutils/gas/config/te-multi.h
rename to x/binutils/gas/config/te-multi.h
diff --git a/contrib/binutils/gas/config/te-nbsd.h b/x/binutils/gas/config/te-nbsd.h
similarity index 100%
rename from contrib/binutils/gas/config/te-nbsd.h
rename to x/binutils/gas/config/te-nbsd.h
diff --git a/contrib/binutils/gas/config/te-pe.h b/x/binutils/gas/config/te-pe.h
similarity index 100%
rename from contrib/binutils/gas/config/te-pe.h
rename to x/binutils/gas/config/te-pe.h
diff --git a/contrib/binutils/gas/config/te-ppcnw.h b/x/binutils/gas/config/te-ppcnw.h
similarity index 100%
rename from contrib/binutils/gas/config/te-ppcnw.h
rename to x/binutils/gas/config/te-ppcnw.h
diff --git a/contrib/binutils/gas/config/te-sparcaout.h b/x/binutils/gas/config/te-sparcaout.h
similarity index 100%
rename from contrib/binutils/gas/config/te-sparcaout.h
rename to x/binutils/gas/config/te-sparcaout.h
diff --git a/contrib/binutils/gas/config/te-svr4.h b/x/binutils/gas/config/te-svr4.h
similarity index 100%
rename from contrib/binutils/gas/config/te-svr4.h
rename to x/binutils/gas/config/te-svr4.h
diff --git a/contrib/binutils/gas/config/te-sysv32.h b/x/binutils/gas/config/te-sysv32.h
similarity index 100%
rename from contrib/binutils/gas/config/te-sysv32.h
rename to x/binutils/gas/config/te-sysv32.h
diff --git a/contrib/binutils/gas/config/te-tmips.h b/x/binutils/gas/config/te-tmips.h
similarity index 100%
rename from contrib/binutils/gas/config/te-tmips.h
rename to x/binutils/gas/config/te-tmips.h
diff --git a/contrib/binutils/gas/configure b/x/binutils/gas/configure
similarity index 100%
rename from contrib/binutils/gas/configure
rename to x/binutils/gas/configure
diff --git a/contrib/binutils/gas/configure.in b/x/binutils/gas/configure.in
similarity index 100%
rename from contrib/binutils/gas/configure.in
rename to x/binutils/gas/configure.in
diff --git a/contrib/binutils/gas/debug.c b/x/binutils/gas/debug.c
similarity index 100%
rename from contrib/binutils/gas/debug.c
rename to x/binutils/gas/debug.c
diff --git a/contrib/binutils/gas/dep-in.sed b/x/binutils/gas/dep-in.sed
similarity index 100%
rename from contrib/binutils/gas/dep-in.sed
rename to x/binutils/gas/dep-in.sed
diff --git a/contrib/binutils/gas/depend.c b/x/binutils/gas/depend.c
similarity index 100%
rename from contrib/binutils/gas/depend.c
rename to x/binutils/gas/depend.c
diff --git a/contrib/binutils/gas/doc/Makefile.am b/x/binutils/gas/doc/Makefile.am
similarity index 100%
rename from contrib/binutils/gas/doc/Makefile.am
rename to x/binutils/gas/doc/Makefile.am
diff --git a/contrib/binutils/gas/doc/Makefile.in b/x/binutils/gas/doc/Makefile.in
similarity index 100%
rename from contrib/binutils/gas/doc/Makefile.in
rename to x/binutils/gas/doc/Makefile.in
diff --git a/contrib/binutils/gas/doc/all.texi b/x/binutils/gas/doc/all.texi
similarity index 100%
rename from contrib/binutils/gas/doc/all.texi
rename to x/binutils/gas/doc/all.texi
diff --git a/contrib/binutils/gas/doc/as.1 b/x/binutils/gas/doc/as.1
similarity index 100%
rename from contrib/binutils/gas/doc/as.1
rename to x/binutils/gas/doc/as.1
diff --git a/contrib/binutils/gas/doc/as.texinfo b/x/binutils/gas/doc/as.texinfo
similarity index 100%
rename from contrib/binutils/gas/doc/as.texinfo
rename to x/binutils/gas/doc/as.texinfo
diff --git a/contrib/binutils/gas/doc/c-alpha.texi b/x/binutils/gas/doc/c-alpha.texi
similarity index 100%
rename from contrib/binutils/gas/doc/c-alpha.texi
rename to x/binutils/gas/doc/c-alpha.texi
diff --git a/contrib/binutils/gas/doc/c-arc.texi b/x/binutils/gas/doc/c-arc.texi
similarity index 100%
rename from contrib/binutils/gas/doc/c-arc.texi
rename to x/binutils/gas/doc/c-arc.texi
diff --git a/contrib/binutils/gas/doc/c-arm.texi b/x/binutils/gas/doc/c-arm.texi
similarity index 100%
rename from contrib/binutils/gas/doc/c-arm.texi
rename to x/binutils/gas/doc/c-arm.texi
diff --git a/contrib/binutils/gas/doc/c-i386.texi b/x/binutils/gas/doc/c-i386.texi
similarity index 100%
rename from contrib/binutils/gas/doc/c-i386.texi
rename to x/binutils/gas/doc/c-i386.texi
diff --git a/contrib/binutils/gas/doc/c-ia64.texi b/x/binutils/gas/doc/c-ia64.texi
similarity index 100%
rename from contrib/binutils/gas/doc/c-ia64.texi
rename to x/binutils/gas/doc/c-ia64.texi
diff --git a/contrib/binutils/gas/doc/c-mips.texi b/x/binutils/gas/doc/c-mips.texi
similarity index 100%
rename from contrib/binutils/gas/doc/c-mips.texi
rename to x/binutils/gas/doc/c-mips.texi
diff --git a/contrib/binutils/gas/doc/c-ppc.texi b/x/binutils/gas/doc/c-ppc.texi
similarity index 100%
rename from contrib/binutils/gas/doc/c-ppc.texi
rename to x/binutils/gas/doc/c-ppc.texi
diff --git a/contrib/binutils/gas/doc/c-sh.texi b/x/binutils/gas/doc/c-sh.texi
similarity index 100%
rename from contrib/binutils/gas/doc/c-sh.texi
rename to x/binutils/gas/doc/c-sh.texi
diff --git a/contrib/binutils/gas/doc/c-sparc.texi b/x/binutils/gas/doc/c-sparc.texi
similarity index 100%
rename from contrib/binutils/gas/doc/c-sparc.texi
rename to x/binutils/gas/doc/c-sparc.texi
diff --git a/contrib/binutils/gas/doc/c-v850.texi b/x/binutils/gas/doc/c-v850.texi
similarity index 100%
rename from contrib/binutils/gas/doc/c-v850.texi
rename to x/binutils/gas/doc/c-v850.texi
diff --git a/contrib/binutils/gas/doc/c-z8k.texi b/x/binutils/gas/doc/c-z8k.texi
similarity index 100%
rename from contrib/binutils/gas/doc/c-z8k.texi
rename to x/binutils/gas/doc/c-z8k.texi
diff --git a/contrib/binutils/gas/doc/gasp.texi b/x/binutils/gas/doc/gasp.texi
similarity index 100%
rename from contrib/binutils/gas/doc/gasp.texi
rename to x/binutils/gas/doc/gasp.texi
diff --git a/contrib/binutils/gas/doc/gasver.texi b/x/binutils/gas/doc/gasver.texi
similarity index 100%
rename from contrib/binutils/gas/doc/gasver.texi
rename to x/binutils/gas/doc/gasver.texi
diff --git a/contrib/binutils/gas/doc/h8.texi b/x/binutils/gas/doc/h8.texi
similarity index 100%
rename from contrib/binutils/gas/doc/h8.texi
rename to x/binutils/gas/doc/h8.texi
diff --git a/contrib/binutils/gas/doc/internals.texi b/x/binutils/gas/doc/internals.texi
similarity index 100%
rename from contrib/binutils/gas/doc/internals.texi
rename to x/binutils/gas/doc/internals.texi
diff --git a/contrib/binutils/gas/dw2gencfi.c b/x/binutils/gas/dw2gencfi.c
similarity index 100%
rename from contrib/binutils/gas/dw2gencfi.c
rename to x/binutils/gas/dw2gencfi.c
diff --git a/contrib/binutils/gas/dw2gencfi.h b/x/binutils/gas/dw2gencfi.h
similarity index 100%
rename from contrib/binutils/gas/dw2gencfi.h
rename to x/binutils/gas/dw2gencfi.h
diff --git a/contrib/binutils/gas/dwarf2dbg.c b/x/binutils/gas/dwarf2dbg.c
similarity index 100%
rename from contrib/binutils/gas/dwarf2dbg.c
rename to x/binutils/gas/dwarf2dbg.c
diff --git a/contrib/binutils/gas/dwarf2dbg.h b/x/binutils/gas/dwarf2dbg.h
similarity index 100%
rename from contrib/binutils/gas/dwarf2dbg.h
rename to x/binutils/gas/dwarf2dbg.h
diff --git a/contrib/binutils/gas/ecoff.c b/x/binutils/gas/ecoff.c
similarity index 100%
rename from contrib/binutils/gas/ecoff.c
rename to x/binutils/gas/ecoff.c
diff --git a/contrib/binutils/gas/ecoff.h b/x/binutils/gas/ecoff.h
similarity index 100%
rename from contrib/binutils/gas/ecoff.h
rename to x/binutils/gas/ecoff.h
diff --git a/contrib/binutils/gas/ehopt.c b/x/binutils/gas/ehopt.c
similarity index 100%
rename from contrib/binutils/gas/ehopt.c
rename to x/binutils/gas/ehopt.c
diff --git a/contrib/binutils/gas/emul-target.h b/x/binutils/gas/emul-target.h
similarity index 100%
rename from contrib/binutils/gas/emul-target.h
rename to x/binutils/gas/emul-target.h
diff --git a/contrib/binutils/gas/emul.h b/x/binutils/gas/emul.h
similarity index 100%
rename from contrib/binutils/gas/emul.h
rename to x/binutils/gas/emul.h
diff --git a/contrib/binutils/gas/expr.c b/x/binutils/gas/expr.c
similarity index 100%
rename from contrib/binutils/gas/expr.c
rename to x/binutils/gas/expr.c
diff --git a/contrib/binutils/gas/expr.h b/x/binutils/gas/expr.h
similarity index 100%
rename from contrib/binutils/gas/expr.h
rename to x/binutils/gas/expr.h
diff --git a/contrib/binutils/gas/flonum-copy.c b/x/binutils/gas/flonum-copy.c
similarity index 100%
rename from contrib/binutils/gas/flonum-copy.c
rename to x/binutils/gas/flonum-copy.c
diff --git a/contrib/binutils/gas/flonum-konst.c b/x/binutils/gas/flonum-konst.c
similarity index 100%
rename from contrib/binutils/gas/flonum-konst.c
rename to x/binutils/gas/flonum-konst.c
diff --git a/contrib/binutils/gas/flonum-mult.c b/x/binutils/gas/flonum-mult.c
similarity index 100%
rename from contrib/binutils/gas/flonum-mult.c
rename to x/binutils/gas/flonum-mult.c
diff --git a/contrib/binutils/gas/flonum.h b/x/binutils/gas/flonum.h
similarity index 100%
rename from contrib/binutils/gas/flonum.h
rename to x/binutils/gas/flonum.h
diff --git a/contrib/binutils/gas/frags.c b/x/binutils/gas/frags.c
similarity index 100%
rename from contrib/binutils/gas/frags.c
rename to x/binutils/gas/frags.c
diff --git a/contrib/binutils/gas/frags.h b/x/binutils/gas/frags.h
similarity index 100%
rename from contrib/binutils/gas/frags.h
rename to x/binutils/gas/frags.h
diff --git a/contrib/binutils/gas/gasp.c b/x/binutils/gas/gasp.c
similarity index 100%
rename from contrib/binutils/gas/gasp.c
rename to x/binutils/gas/gasp.c
diff --git a/contrib/binutils/gas/gdbinit.in b/x/binutils/gas/gdbinit.in
similarity index 100%
rename from contrib/binutils/gas/gdbinit.in
rename to x/binutils/gas/gdbinit.in
diff --git a/contrib/binutils/gas/hash.c b/x/binutils/gas/hash.c
similarity index 100%
rename from contrib/binutils/gas/hash.c
rename to x/binutils/gas/hash.c
diff --git a/contrib/binutils/gas/hash.h b/x/binutils/gas/hash.h
similarity index 100%
rename from contrib/binutils/gas/hash.h
rename to x/binutils/gas/hash.h
diff --git a/contrib/binutils/gas/input-file.c b/x/binutils/gas/input-file.c
similarity index 100%
rename from contrib/binutils/gas/input-file.c
rename to x/binutils/gas/input-file.c
diff --git a/contrib/binutils/gas/input-file.h b/x/binutils/gas/input-file.h
similarity index 100%
rename from contrib/binutils/gas/input-file.h
rename to x/binutils/gas/input-file.h
diff --git a/contrib/binutils/gas/input-scrub.c b/x/binutils/gas/input-scrub.c
similarity index 100%
rename from contrib/binutils/gas/input-scrub.c
rename to x/binutils/gas/input-scrub.c
diff --git a/contrib/binutils/gas/itbl-lex.l b/x/binutils/gas/itbl-lex.l
similarity index 100%
rename from contrib/binutils/gas/itbl-lex.l
rename to x/binutils/gas/itbl-lex.l
diff --git a/contrib/binutils/gas/itbl-ops.c b/x/binutils/gas/itbl-ops.c
similarity index 100%
rename from contrib/binutils/gas/itbl-ops.c
rename to x/binutils/gas/itbl-ops.c
diff --git a/contrib/binutils/gas/itbl-ops.h b/x/binutils/gas/itbl-ops.h
similarity index 100%
rename from contrib/binutils/gas/itbl-ops.h
rename to x/binutils/gas/itbl-ops.h
diff --git a/contrib/binutils/gas/itbl-parse.y b/x/binutils/gas/itbl-parse.y
similarity index 100%
rename from contrib/binutils/gas/itbl-parse.y
rename to x/binutils/gas/itbl-parse.y
diff --git a/contrib/binutils/gas/link.cmd b/x/binutils/gas/link.cmd
similarity index 100%
rename from contrib/binutils/gas/link.cmd
rename to x/binutils/gas/link.cmd
diff --git a/contrib/binutils/gas/listing.c b/x/binutils/gas/listing.c
similarity index 100%
rename from contrib/binutils/gas/listing.c
rename to x/binutils/gas/listing.c
diff --git a/contrib/binutils/gas/listing.h b/x/binutils/gas/listing.h
similarity index 100%
rename from contrib/binutils/gas/listing.h
rename to x/binutils/gas/listing.h
diff --git a/contrib/binutils/gas/literal.c b/x/binutils/gas/literal.c
similarity index 100%
rename from contrib/binutils/gas/literal.c
rename to x/binutils/gas/literal.c
diff --git a/contrib/binutils/gas/macro.c b/x/binutils/gas/macro.c
similarity index 100%
rename from contrib/binutils/gas/macro.c
rename to x/binutils/gas/macro.c
diff --git a/contrib/binutils/gas/macro.h b/x/binutils/gas/macro.h
similarity index 100%
rename from contrib/binutils/gas/macro.h
rename to x/binutils/gas/macro.h
diff --git a/contrib/binutils/gas/messages.c b/x/binutils/gas/messages.c
similarity index 100%
rename from contrib/binutils/gas/messages.c
rename to x/binutils/gas/messages.c
diff --git a/contrib/binutils/gas/obj.h b/x/binutils/gas/obj.h
similarity index 100%
rename from contrib/binutils/gas/obj.h
rename to x/binutils/gas/obj.h
diff --git a/contrib/binutils/gas/output-file.c b/x/binutils/gas/output-file.c
similarity index 100%
rename from contrib/binutils/gas/output-file.c
rename to x/binutils/gas/output-file.c
diff --git a/contrib/binutils/gas/output-file.h b/x/binutils/gas/output-file.h
similarity index 100%
rename from contrib/binutils/gas/output-file.h
rename to x/binutils/gas/output-file.h
diff --git a/contrib/binutils/gas/po/Make-in b/x/binutils/gas/po/Make-in
similarity index 100%
rename from contrib/binutils/gas/po/Make-in
rename to x/binutils/gas/po/Make-in
diff --git a/contrib/binutils/gas/po/POTFILES.in b/x/binutils/gas/po/POTFILES.in
similarity index 100%
rename from contrib/binutils/gas/po/POTFILES.in
rename to x/binutils/gas/po/POTFILES.in
diff --git a/contrib/binutils/gas/po/gas.pot b/x/binutils/gas/po/gas.pot
similarity index 100%
rename from contrib/binutils/gas/po/gas.pot
rename to x/binutils/gas/po/gas.pot
diff --git a/contrib/binutils/gas/read.c b/x/binutils/gas/read.c
similarity index 100%
rename from contrib/binutils/gas/read.c
rename to x/binutils/gas/read.c
diff --git a/contrib/binutils/gas/read.h b/x/binutils/gas/read.h
similarity index 100%
rename from contrib/binutils/gas/read.h
rename to x/binutils/gas/read.h
diff --git a/contrib/binutils/gas/sb.c b/x/binutils/gas/sb.c
similarity index 100%
rename from contrib/binutils/gas/sb.c
rename to x/binutils/gas/sb.c
diff --git a/contrib/binutils/gas/sb.h b/x/binutils/gas/sb.h
similarity index 100%
rename from contrib/binutils/gas/sb.h
rename to x/binutils/gas/sb.h
diff --git a/contrib/binutils/gas/stabs.c b/x/binutils/gas/stabs.c
similarity index 100%
rename from contrib/binutils/gas/stabs.c
rename to x/binutils/gas/stabs.c
diff --git a/contrib/binutils/gas/stamp-h.in b/x/binutils/gas/stamp-h.in
similarity index 100%
rename from contrib/binutils/gas/stamp-h.in
rename to x/binutils/gas/stamp-h.in
diff --git a/contrib/binutils/gas/struc-symbol.h b/x/binutils/gas/struc-symbol.h
similarity index 100%
rename from contrib/binutils/gas/struc-symbol.h
rename to x/binutils/gas/struc-symbol.h
diff --git a/contrib/binutils/gas/subsegs.c b/x/binutils/gas/subsegs.c
similarity index 100%
rename from contrib/binutils/gas/subsegs.c
rename to x/binutils/gas/subsegs.c
diff --git a/contrib/binutils/gas/subsegs.h b/x/binutils/gas/subsegs.h
similarity index 100%
rename from contrib/binutils/gas/subsegs.h
rename to x/binutils/gas/subsegs.h
diff --git a/contrib/binutils/gas/symbols.c b/x/binutils/gas/symbols.c
similarity index 100%
rename from contrib/binutils/gas/symbols.c
rename to x/binutils/gas/symbols.c
diff --git a/contrib/binutils/gas/symbols.h b/x/binutils/gas/symbols.h
similarity index 100%
rename from contrib/binutils/gas/symbols.h
rename to x/binutils/gas/symbols.h
diff --git a/contrib/binutils/gas/tc.h b/x/binutils/gas/tc.h
similarity index 100%
rename from contrib/binutils/gas/tc.h
rename to x/binutils/gas/tc.h
diff --git a/contrib/binutils/gas/write.c b/x/binutils/gas/write.c
similarity index 100%
rename from contrib/binutils/gas/write.c
rename to x/binutils/gas/write.c
diff --git a/contrib/binutils/gas/write.h b/x/binutils/gas/write.h
similarity index 100%
rename from contrib/binutils/gas/write.h
rename to x/binutils/gas/write.h
diff --git a/contrib/binutils/gprof/mips.c b/x/binutils/gprof/mips.c
similarity index 100%
rename from contrib/binutils/gprof/mips.c
rename to x/binutils/gprof/mips.c
diff --git a/contrib/binutils/gprof/po/Make-in b/x/binutils/gprof/po/Make-in
similarity index 100%
rename from contrib/binutils/gprof/po/Make-in
rename to x/binutils/gprof/po/Make-in
diff --git a/contrib/binutils/gprof/po/POTFILES.in b/x/binutils/gprof/po/POTFILES.in
similarity index 100%
rename from contrib/binutils/gprof/po/POTFILES.in
rename to x/binutils/gprof/po/POTFILES.in
diff --git a/contrib/binutils/gprof/po/gprof.pot b/x/binutils/gprof/po/gprof.pot
similarity index 100%
rename from contrib/binutils/gprof/po/gprof.pot
rename to x/binutils/gprof/po/gprof.pot
diff --git a/contrib/binutils/include/ChangeLog b/x/binutils/include/ChangeLog
similarity index 100%
rename from contrib/binutils/include/ChangeLog
rename to x/binutils/include/ChangeLog
diff --git a/contrib/binutils/include/MAINTAINERS b/x/binutils/include/MAINTAINERS
similarity index 100%
rename from contrib/binutils/include/MAINTAINERS
rename to x/binutils/include/MAINTAINERS
diff --git a/contrib/binutils/include/alloca-conf.h b/x/binutils/include/alloca-conf.h
similarity index 100%
rename from contrib/binutils/include/alloca-conf.h
rename to x/binutils/include/alloca-conf.h
diff --git a/contrib/binutils/include/ansidecl.h b/x/binutils/include/ansidecl.h
similarity index 100%
rename from contrib/binutils/include/ansidecl.h
rename to x/binutils/include/ansidecl.h
diff --git a/contrib/binutils/include/aout/ChangeLog b/x/binutils/include/aout/ChangeLog
similarity index 100%
rename from contrib/binutils/include/aout/ChangeLog
rename to x/binutils/include/aout/ChangeLog
diff --git a/contrib/binutils/include/aout/aout64.h b/x/binutils/include/aout/aout64.h
similarity index 100%
rename from contrib/binutils/include/aout/aout64.h
rename to x/binutils/include/aout/aout64.h
diff --git a/contrib/binutils/include/aout/ar.h b/x/binutils/include/aout/ar.h
similarity index 100%
rename from contrib/binutils/include/aout/ar.h
rename to x/binutils/include/aout/ar.h
diff --git a/contrib/binutils/include/aout/encap.h b/x/binutils/include/aout/encap.h
similarity index 100%
rename from contrib/binutils/include/aout/encap.h
rename to x/binutils/include/aout/encap.h
diff --git a/contrib/binutils/include/aout/host.h b/x/binutils/include/aout/host.h
similarity index 100%
rename from contrib/binutils/include/aout/host.h
rename to x/binutils/include/aout/host.h
diff --git a/contrib/binutils/include/aout/ranlib.h b/x/binutils/include/aout/ranlib.h
similarity index 100%
rename from contrib/binutils/include/aout/ranlib.h
rename to x/binutils/include/aout/ranlib.h
diff --git a/contrib/binutils/include/aout/reloc.h b/x/binutils/include/aout/reloc.h
similarity index 100%
rename from contrib/binutils/include/aout/reloc.h
rename to x/binutils/include/aout/reloc.h
diff --git a/contrib/binutils/include/aout/stab.def b/x/binutils/include/aout/stab.def
similarity index 100%
rename from contrib/binutils/include/aout/stab.def
rename to x/binutils/include/aout/stab.def
diff --git a/contrib/binutils/include/aout/stab_gnu.h b/x/binutils/include/aout/stab_gnu.h
similarity index 100%
rename from contrib/binutils/include/aout/stab_gnu.h
rename to x/binutils/include/aout/stab_gnu.h
diff --git a/contrib/binutils/include/aout/sun4.h b/x/binutils/include/aout/sun4.h
similarity index 100%
rename from contrib/binutils/include/aout/sun4.h
rename to x/binutils/include/aout/sun4.h
diff --git a/contrib/binutils/include/bfdlink.h b/x/binutils/include/bfdlink.h
similarity index 100%
rename from contrib/binutils/include/bfdlink.h
rename to x/binutils/include/bfdlink.h
diff --git a/contrib/binutils/include/bin-bugs.h b/x/binutils/include/bin-bugs.h
similarity index 100%
rename from contrib/binutils/include/bin-bugs.h
rename to x/binutils/include/bin-bugs.h
diff --git a/contrib/binutils/include/callback.h b/x/binutils/include/callback.h
similarity index 100%
rename from contrib/binutils/include/callback.h
rename to x/binutils/include/callback.h
diff --git a/contrib/binutils/include/coff/ChangeLog b/x/binutils/include/coff/ChangeLog
similarity index 100%
rename from contrib/binutils/include/coff/ChangeLog
rename to x/binutils/include/coff/ChangeLog
diff --git a/contrib/binutils/include/coff/alpha.h b/x/binutils/include/coff/alpha.h
similarity index 100%
rename from contrib/binutils/include/coff/alpha.h
rename to x/binutils/include/coff/alpha.h
diff --git a/contrib/binutils/include/coff/arm.h b/x/binutils/include/coff/arm.h
similarity index 100%
rename from contrib/binutils/include/coff/arm.h
rename to x/binutils/include/coff/arm.h
diff --git a/contrib/binutils/include/coff/aux-coff.h b/x/binutils/include/coff/aux-coff.h
similarity index 100%
rename from contrib/binutils/include/coff/aux-coff.h
rename to x/binutils/include/coff/aux-coff.h
diff --git a/contrib/binutils/include/coff/ecoff.h b/x/binutils/include/coff/ecoff.h
similarity index 100%
rename from contrib/binutils/include/coff/ecoff.h
rename to x/binutils/include/coff/ecoff.h
diff --git a/contrib/binutils/include/coff/external.h b/x/binutils/include/coff/external.h
similarity index 100%
rename from contrib/binutils/include/coff/external.h
rename to x/binutils/include/coff/external.h
diff --git a/contrib/binutils/include/coff/i386.h b/x/binutils/include/coff/i386.h
similarity index 100%
rename from contrib/binutils/include/coff/i386.h
rename to x/binutils/include/coff/i386.h
diff --git a/contrib/binutils/include/coff/ia64.h b/x/binutils/include/coff/ia64.h
similarity index 100%
rename from contrib/binutils/include/coff/ia64.h
rename to x/binutils/include/coff/ia64.h
diff --git a/contrib/binutils/include/coff/internal.h b/x/binutils/include/coff/internal.h
similarity index 100%
rename from contrib/binutils/include/coff/internal.h
rename to x/binutils/include/coff/internal.h
diff --git a/contrib/binutils/include/coff/mips.h b/x/binutils/include/coff/mips.h
similarity index 100%
rename from contrib/binutils/include/coff/mips.h
rename to x/binutils/include/coff/mips.h
diff --git a/contrib/binutils/include/coff/mipspe.h b/x/binutils/include/coff/mipspe.h
similarity index 100%
rename from contrib/binutils/include/coff/mipspe.h
rename to x/binutils/include/coff/mipspe.h
diff --git a/contrib/binutils/include/coff/pe.h b/x/binutils/include/coff/pe.h
similarity index 100%
rename from contrib/binutils/include/coff/pe.h
rename to x/binutils/include/coff/pe.h
diff --git a/contrib/binutils/include/coff/powerpc.h b/x/binutils/include/coff/powerpc.h
similarity index 100%
rename from contrib/binutils/include/coff/powerpc.h
rename to x/binutils/include/coff/powerpc.h
diff --git a/contrib/binutils/include/coff/rs6000.h b/x/binutils/include/coff/rs6000.h
similarity index 100%
rename from contrib/binutils/include/coff/rs6000.h
rename to x/binutils/include/coff/rs6000.h
diff --git a/contrib/binutils/include/coff/rs6k64.h b/x/binutils/include/coff/rs6k64.h
similarity index 100%
rename from contrib/binutils/include/coff/rs6k64.h
rename to x/binutils/include/coff/rs6k64.h
diff --git a/contrib/binutils/include/coff/sh.h b/x/binutils/include/coff/sh.h
similarity index 100%
rename from contrib/binutils/include/coff/sh.h
rename to x/binutils/include/coff/sh.h
diff --git a/contrib/binutils/include/coff/sparc.h b/x/binutils/include/coff/sparc.h
similarity index 100%
rename from contrib/binutils/include/coff/sparc.h
rename to x/binutils/include/coff/sparc.h
diff --git a/contrib/binutils/include/coff/sym.h b/x/binutils/include/coff/sym.h
similarity index 100%
rename from contrib/binutils/include/coff/sym.h
rename to x/binutils/include/coff/sym.h
diff --git a/contrib/binutils/include/coff/symconst.h b/x/binutils/include/coff/symconst.h
similarity index 100%
rename from contrib/binutils/include/coff/symconst.h
rename to x/binutils/include/coff/symconst.h
diff --git a/contrib/binutils/include/coff/ti.h b/x/binutils/include/coff/ti.h
similarity index 100%
rename from contrib/binutils/include/coff/ti.h
rename to x/binutils/include/coff/ti.h
diff --git a/contrib/binutils/include/coff/xcoff.h b/x/binutils/include/coff/xcoff.h
similarity index 100%
rename from contrib/binutils/include/coff/xcoff.h
rename to x/binutils/include/coff/xcoff.h
diff --git a/contrib/binutils/include/demangle.h b/x/binutils/include/demangle.h
similarity index 100%
rename from contrib/binutils/include/demangle.h
rename to x/binutils/include/demangle.h
diff --git a/contrib/binutils/include/dis-asm.h b/x/binutils/include/dis-asm.h
similarity index 100%
rename from contrib/binutils/include/dis-asm.h
rename to x/binutils/include/dis-asm.h
diff --git a/contrib/binutils/include/dyn-string.h b/x/binutils/include/dyn-string.h
similarity index 100%
rename from contrib/binutils/include/dyn-string.h
rename to x/binutils/include/dyn-string.h
diff --git a/contrib/binutils/include/elf/ChangeLog b/x/binutils/include/elf/ChangeLog
similarity index 100%
rename from contrib/binutils/include/elf/ChangeLog
rename to x/binutils/include/elf/ChangeLog
diff --git a/contrib/binutils/include/elf/ChangeLog-9103 b/x/binutils/include/elf/ChangeLog-9103
similarity index 100%
rename from contrib/binutils/include/elf/ChangeLog-9103
rename to x/binutils/include/elf/ChangeLog-9103
diff --git a/contrib/binutils/include/elf/alpha.h b/x/binutils/include/elf/alpha.h
similarity index 100%
rename from contrib/binutils/include/elf/alpha.h
rename to x/binutils/include/elf/alpha.h
diff --git a/contrib/binutils/include/elf/arc.h b/x/binutils/include/elf/arc.h
similarity index 100%
rename from contrib/binutils/include/elf/arc.h
rename to x/binutils/include/elf/arc.h
diff --git a/contrib/binutils/include/elf/arm-oabi.h b/x/binutils/include/elf/arm-oabi.h
similarity index 100%
rename from contrib/binutils/include/elf/arm-oabi.h
rename to x/binutils/include/elf/arm-oabi.h
diff --git a/contrib/binutils/include/elf/arm.h b/x/binutils/include/elf/arm.h
similarity index 100%
rename from contrib/binutils/include/elf/arm.h
rename to x/binutils/include/elf/arm.h
diff --git a/contrib/binutils/include/elf/avr.h b/x/binutils/include/elf/avr.h
similarity index 100%
rename from contrib/binutils/include/elf/avr.h
rename to x/binutils/include/elf/avr.h
diff --git a/contrib/binutils/include/elf/common.h b/x/binutils/include/elf/common.h
similarity index 100%
rename from contrib/binutils/include/elf/common.h
rename to x/binutils/include/elf/common.h
diff --git a/contrib/binutils/include/elf/cris.h b/x/binutils/include/elf/cris.h
similarity index 100%
rename from contrib/binutils/include/elf/cris.h
rename to x/binutils/include/elf/cris.h
diff --git a/contrib/binutils/include/elf/d10v.h b/x/binutils/include/elf/d10v.h
similarity index 100%
rename from contrib/binutils/include/elf/d10v.h
rename to x/binutils/include/elf/d10v.h
diff --git a/contrib/binutils/include/elf/d30v.h b/x/binutils/include/elf/d30v.h
similarity index 100%
rename from contrib/binutils/include/elf/d30v.h
rename to x/binutils/include/elf/d30v.h
diff --git a/contrib/binutils/include/elf/dlx.h b/x/binutils/include/elf/dlx.h
similarity index 100%
rename from contrib/binutils/include/elf/dlx.h
rename to x/binutils/include/elf/dlx.h
diff --git a/contrib/binutils/include/elf/dwarf.h b/x/binutils/include/elf/dwarf.h
similarity index 100%
rename from contrib/binutils/include/elf/dwarf.h
rename to x/binutils/include/elf/dwarf.h
diff --git a/contrib/binutils/include/elf/dwarf2.h b/x/binutils/include/elf/dwarf2.h
similarity index 100%
rename from contrib/binutils/include/elf/dwarf2.h
rename to x/binutils/include/elf/dwarf2.h
diff --git a/contrib/binutils/include/elf/external.h b/x/binutils/include/elf/external.h
similarity index 100%
rename from contrib/binutils/include/elf/external.h
rename to x/binutils/include/elf/external.h
diff --git a/contrib/binutils/include/elf/fr30.h b/x/binutils/include/elf/fr30.h
similarity index 100%
rename from contrib/binutils/include/elf/fr30.h
rename to x/binutils/include/elf/fr30.h
diff --git a/contrib/binutils/include/elf/frv.h b/x/binutils/include/elf/frv.h
similarity index 100%
rename from contrib/binutils/include/elf/frv.h
rename to x/binutils/include/elf/frv.h
diff --git a/contrib/binutils/include/elf/h8.h b/x/binutils/include/elf/h8.h
similarity index 100%
rename from contrib/binutils/include/elf/h8.h
rename to x/binutils/include/elf/h8.h
diff --git a/contrib/binutils/include/elf/hppa.h b/x/binutils/include/elf/hppa.h
similarity index 100%
rename from contrib/binutils/include/elf/hppa.h
rename to x/binutils/include/elf/hppa.h
diff --git a/contrib/binutils/include/elf/i370.h b/x/binutils/include/elf/i370.h
similarity index 100%
rename from contrib/binutils/include/elf/i370.h
rename to x/binutils/include/elf/i370.h
diff --git a/contrib/binutils/include/elf/i386.h b/x/binutils/include/elf/i386.h
similarity index 100%
rename from contrib/binutils/include/elf/i386.h
rename to x/binutils/include/elf/i386.h
diff --git a/contrib/binutils/include/elf/i860.h b/x/binutils/include/elf/i860.h
similarity index 100%
rename from contrib/binutils/include/elf/i860.h
rename to x/binutils/include/elf/i860.h
diff --git a/contrib/binutils/include/elf/i960.h b/x/binutils/include/elf/i960.h
similarity index 100%
rename from contrib/binutils/include/elf/i960.h
rename to x/binutils/include/elf/i960.h
diff --git a/contrib/binutils/include/elf/ia64.h b/x/binutils/include/elf/ia64.h
similarity index 100%
rename from contrib/binutils/include/elf/ia64.h
rename to x/binutils/include/elf/ia64.h
diff --git a/contrib/binutils/include/elf/internal.h b/x/binutils/include/elf/internal.h
similarity index 100%
rename from contrib/binutils/include/elf/internal.h
rename to x/binutils/include/elf/internal.h
diff --git a/contrib/binutils/include/elf/ip2k.h b/x/binutils/include/elf/ip2k.h
similarity index 100%
rename from contrib/binutils/include/elf/ip2k.h
rename to x/binutils/include/elf/ip2k.h
diff --git a/contrib/binutils/include/elf/iq2000.h b/x/binutils/include/elf/iq2000.h
similarity index 100%
rename from contrib/binutils/include/elf/iq2000.h
rename to x/binutils/include/elf/iq2000.h
diff --git a/contrib/binutils/include/elf/m32r.h b/x/binutils/include/elf/m32r.h
similarity index 100%
rename from contrib/binutils/include/elf/m32r.h
rename to x/binutils/include/elf/m32r.h
diff --git a/contrib/binutils/include/elf/m68hc11.h b/x/binutils/include/elf/m68hc11.h
similarity index 100%
rename from contrib/binutils/include/elf/m68hc11.h
rename to x/binutils/include/elf/m68hc11.h
diff --git a/contrib/binutils/include/elf/m68k.h b/x/binutils/include/elf/m68k.h
similarity index 100%
rename from contrib/binutils/include/elf/m68k.h
rename to x/binutils/include/elf/m68k.h
diff --git a/contrib/binutils/include/elf/mcore.h b/x/binutils/include/elf/mcore.h
similarity index 100%
rename from contrib/binutils/include/elf/mcore.h
rename to x/binutils/include/elf/mcore.h
diff --git a/contrib/binutils/include/elf/mips.h b/x/binutils/include/elf/mips.h
similarity index 100%
rename from contrib/binutils/include/elf/mips.h
rename to x/binutils/include/elf/mips.h
diff --git a/contrib/binutils/include/elf/mmix.h b/x/binutils/include/elf/mmix.h
similarity index 100%
rename from contrib/binutils/include/elf/mmix.h
rename to x/binutils/include/elf/mmix.h
diff --git a/contrib/binutils/include/elf/mn10200.h b/x/binutils/include/elf/mn10200.h
similarity index 100%
rename from contrib/binutils/include/elf/mn10200.h
rename to x/binutils/include/elf/mn10200.h
diff --git a/contrib/binutils/include/elf/mn10300.h b/x/binutils/include/elf/mn10300.h
similarity index 100%
rename from contrib/binutils/include/elf/mn10300.h
rename to x/binutils/include/elf/mn10300.h
diff --git a/contrib/binutils/include/elf/msp430.h b/x/binutils/include/elf/msp430.h
similarity index 100%
rename from contrib/binutils/include/elf/msp430.h
rename to x/binutils/include/elf/msp430.h
diff --git a/contrib/binutils/include/elf/openrisc.h b/x/binutils/include/elf/openrisc.h
similarity index 100%
rename from contrib/binutils/include/elf/openrisc.h
rename to x/binutils/include/elf/openrisc.h
diff --git a/contrib/binutils/include/elf/or32.h b/x/binutils/include/elf/or32.h
similarity index 100%
rename from contrib/binutils/include/elf/or32.h
rename to x/binutils/include/elf/or32.h
diff --git a/contrib/binutils/include/elf/pj.h b/x/binutils/include/elf/pj.h
similarity index 100%
rename from contrib/binutils/include/elf/pj.h
rename to x/binutils/include/elf/pj.h
diff --git a/contrib/binutils/include/elf/po/Make-in b/x/binutils/include/elf/po/Make-in
similarity index 100%
rename from contrib/binutils/include/elf/po/Make-in
rename to x/binutils/include/elf/po/Make-in
diff --git a/contrib/binutils/include/elf/po/POTFILES.in b/x/binutils/include/elf/po/POTFILES.in
similarity index 100%
rename from contrib/binutils/include/elf/po/POTFILES.in
rename to x/binutils/include/elf/po/POTFILES.in
diff --git a/contrib/binutils/include/elf/po/binutils.pot b/x/binutils/include/elf/po/binutils.pot
similarity index 100%
rename from contrib/binutils/include/elf/po/binutils.pot
rename to x/binutils/include/elf/po/binutils.pot
diff --git a/contrib/binutils/include/elf/ppc.h b/x/binutils/include/elf/ppc.h
similarity index 100%
rename from contrib/binutils/include/elf/ppc.h
rename to x/binutils/include/elf/ppc.h
diff --git a/contrib/binutils/include/elf/ppc64.h b/x/binutils/include/elf/ppc64.h
similarity index 100%
rename from contrib/binutils/include/elf/ppc64.h
rename to x/binutils/include/elf/ppc64.h
diff --git a/contrib/binutils/include/elf/reloc-macros.h b/x/binutils/include/elf/reloc-macros.h
similarity index 100%
rename from contrib/binutils/include/elf/reloc-macros.h
rename to x/binutils/include/elf/reloc-macros.h
diff --git a/contrib/binutils/include/elf/s390.h b/x/binutils/include/elf/s390.h
similarity index 100%
rename from contrib/binutils/include/elf/s390.h
rename to x/binutils/include/elf/s390.h
diff --git a/contrib/binutils/include/elf/sh.h b/x/binutils/include/elf/sh.h
similarity index 100%
rename from contrib/binutils/include/elf/sh.h
rename to x/binutils/include/elf/sh.h
diff --git a/contrib/binutils/include/elf/sparc.h b/x/binutils/include/elf/sparc.h
similarity index 100%
rename from contrib/binutils/include/elf/sparc.h
rename to x/binutils/include/elf/sparc.h
diff --git a/contrib/binutils/include/elf/v850.h b/x/binutils/include/elf/v850.h
similarity index 100%
rename from contrib/binutils/include/elf/v850.h
rename to x/binutils/include/elf/v850.h
diff --git a/contrib/binutils/include/elf/vax.h b/x/binutils/include/elf/vax.h
similarity index 100%
rename from contrib/binutils/include/elf/vax.h
rename to x/binutils/include/elf/vax.h
diff --git a/contrib/binutils/include/elf/x86-64.h b/x/binutils/include/elf/x86-64.h
similarity index 100%
rename from contrib/binutils/include/elf/x86-64.h
rename to x/binutils/include/elf/x86-64.h
diff --git a/contrib/binutils/include/elf/xstormy16.h b/x/binutils/include/elf/xstormy16.h
similarity index 100%
rename from contrib/binutils/include/elf/xstormy16.h
rename to x/binutils/include/elf/xstormy16.h
diff --git a/contrib/binutils/include/elf/xtensa.h b/x/binutils/include/elf/xtensa.h
similarity index 100%
rename from contrib/binutils/include/elf/xtensa.h
rename to x/binutils/include/elf/xtensa.h
diff --git a/contrib/binutils/include/fibheap.h b/x/binutils/include/fibheap.h
similarity index 100%
rename from contrib/binutils/include/fibheap.h
rename to x/binutils/include/fibheap.h
diff --git a/contrib/binutils/include/filenames.h b/x/binutils/include/filenames.h
similarity index 100%
rename from contrib/binutils/include/filenames.h
rename to x/binutils/include/filenames.h
diff --git a/contrib/binutils/include/floatformat.h b/x/binutils/include/floatformat.h
similarity index 100%
rename from contrib/binutils/include/floatformat.h
rename to x/binutils/include/floatformat.h
diff --git a/contrib/binutils/include/fnmatch.h b/x/binutils/include/fnmatch.h
similarity index 100%
rename from contrib/binutils/include/fnmatch.h
rename to x/binutils/include/fnmatch.h
diff --git a/contrib/binutils/include/fopen-bin.h b/x/binutils/include/fopen-bin.h
similarity index 100%
rename from contrib/binutils/include/fopen-bin.h
rename to x/binutils/include/fopen-bin.h
diff --git a/contrib/binutils/include/fopen-same.h b/x/binutils/include/fopen-same.h
similarity index 100%
rename from contrib/binutils/include/fopen-same.h
rename to x/binutils/include/fopen-same.h
diff --git a/contrib/binutils/include/gdbm.h b/x/binutils/include/gdbm.h
similarity index 100%
rename from contrib/binutils/include/gdbm.h
rename to x/binutils/include/gdbm.h
diff --git a/contrib/binutils/include/getopt.h b/x/binutils/include/getopt.h
similarity index 100%
rename from contrib/binutils/include/getopt.h
rename to x/binutils/include/getopt.h
diff --git a/contrib/binutils/include/hashtab.h b/x/binutils/include/hashtab.h
similarity index 100%
rename from contrib/binutils/include/hashtab.h
rename to x/binutils/include/hashtab.h
diff --git a/contrib/binutils/include/ieee.h b/x/binutils/include/ieee.h
similarity index 100%
rename from contrib/binutils/include/ieee.h
rename to x/binutils/include/ieee.h
diff --git a/contrib/binutils/include/libiberty.h b/x/binutils/include/libiberty.h
similarity index 100%
rename from contrib/binutils/include/libiberty.h
rename to x/binutils/include/libiberty.h
diff --git a/contrib/binutils/include/md5.h b/x/binutils/include/md5.h
similarity index 100%
rename from contrib/binutils/include/md5.h
rename to x/binutils/include/md5.h
diff --git a/contrib/binutils/include/objalloc.h b/x/binutils/include/objalloc.h
similarity index 100%
rename from contrib/binutils/include/objalloc.h
rename to x/binutils/include/objalloc.h
diff --git a/contrib/binutils/include/obstack.h b/x/binutils/include/obstack.h
similarity index 100%
rename from contrib/binutils/include/obstack.h
rename to x/binutils/include/obstack.h
diff --git a/contrib/binutils/include/opcode/ChangeLog b/x/binutils/include/opcode/ChangeLog
similarity index 100%
rename from contrib/binutils/include/opcode/ChangeLog
rename to x/binutils/include/opcode/ChangeLog
diff --git a/contrib/binutils/include/opcode/ChangeLog-9103 b/x/binutils/include/opcode/ChangeLog-9103
similarity index 100%
rename from contrib/binutils/include/opcode/ChangeLog-9103
rename to x/binutils/include/opcode/ChangeLog-9103
diff --git a/contrib/binutils/include/opcode/alpha.h b/x/binutils/include/opcode/alpha.h
similarity index 100%
rename from contrib/binutils/include/opcode/alpha.h
rename to x/binutils/include/opcode/alpha.h
diff --git a/contrib/binutils/include/opcode/arc.h b/x/binutils/include/opcode/arc.h
similarity index 100%
rename from contrib/binutils/include/opcode/arc.h
rename to x/binutils/include/opcode/arc.h
diff --git a/contrib/binutils/include/opcode/arm.h b/x/binutils/include/opcode/arm.h
similarity index 100%
rename from contrib/binutils/include/opcode/arm.h
rename to x/binutils/include/opcode/arm.h
diff --git a/contrib/binutils/include/opcode/cgen.h b/x/binutils/include/opcode/cgen.h
similarity index 100%
rename from contrib/binutils/include/opcode/cgen.h
rename to x/binutils/include/opcode/cgen.h
diff --git a/contrib/binutils/include/opcode/convex.h b/x/binutils/include/opcode/convex.h
similarity index 100%
rename from contrib/binutils/include/opcode/convex.h
rename to x/binutils/include/opcode/convex.h
diff --git a/contrib/binutils/include/opcode/i386.h b/x/binutils/include/opcode/i386.h
similarity index 100%
rename from contrib/binutils/include/opcode/i386.h
rename to x/binutils/include/opcode/i386.h
diff --git a/contrib/binutils/include/opcode/ia64.h b/x/binutils/include/opcode/ia64.h
similarity index 100%
rename from contrib/binutils/include/opcode/ia64.h
rename to x/binutils/include/opcode/ia64.h
diff --git a/contrib/binutils/include/opcode/mips.h b/x/binutils/include/opcode/mips.h
similarity index 100%
rename from contrib/binutils/include/opcode/mips.h
rename to x/binutils/include/opcode/mips.h
diff --git a/contrib/binutils/include/opcode/np1.h b/x/binutils/include/opcode/np1.h
similarity index 100%
rename from contrib/binutils/include/opcode/np1.h
rename to x/binutils/include/opcode/np1.h
diff --git a/contrib/binutils/include/opcode/pn.h b/x/binutils/include/opcode/pn.h
similarity index 100%
rename from contrib/binutils/include/opcode/pn.h
rename to x/binutils/include/opcode/pn.h
diff --git a/contrib/binutils/include/opcode/ppc.h b/x/binutils/include/opcode/ppc.h
similarity index 100%
rename from contrib/binutils/include/opcode/ppc.h
rename to x/binutils/include/opcode/ppc.h
diff --git a/contrib/binutils/include/opcode/s390.h b/x/binutils/include/opcode/s390.h
similarity index 100%
rename from contrib/binutils/include/opcode/s390.h
rename to x/binutils/include/opcode/s390.h
diff --git a/contrib/binutils/include/opcode/sparc.h b/x/binutils/include/opcode/sparc.h
similarity index 100%
rename from contrib/binutils/include/opcode/sparc.h
rename to x/binutils/include/opcode/sparc.h
diff --git a/contrib/binutils/include/partition.h b/x/binutils/include/partition.h
similarity index 100%
rename from contrib/binutils/include/partition.h
rename to x/binutils/include/partition.h
diff --git a/contrib/binutils/include/progress.h b/x/binutils/include/progress.h
similarity index 100%
rename from contrib/binutils/include/progress.h
rename to x/binutils/include/progress.h
diff --git a/contrib/binutils/include/regs/ChangeLog b/x/binutils/include/regs/ChangeLog
similarity index 100%
rename from contrib/binutils/include/regs/ChangeLog
rename to x/binutils/include/regs/ChangeLog
diff --git a/contrib/binutils/include/remote-sim.h b/x/binutils/include/remote-sim.h
similarity index 100%
rename from contrib/binutils/include/remote-sim.h
rename to x/binutils/include/remote-sim.h
diff --git a/contrib/binutils/include/safe-ctype.h b/x/binutils/include/safe-ctype.h
similarity index 100%
rename from contrib/binutils/include/safe-ctype.h
rename to x/binutils/include/safe-ctype.h
diff --git a/contrib/binutils/include/sort.h b/x/binutils/include/sort.h
similarity index 100%
rename from contrib/binutils/include/sort.h
rename to x/binutils/include/sort.h
diff --git a/contrib/binutils/include/splay-tree.h b/x/binutils/include/splay-tree.h
similarity index 100%
rename from contrib/binutils/include/splay-tree.h
rename to x/binutils/include/splay-tree.h
diff --git a/contrib/binutils/include/symcat.h b/x/binutils/include/symcat.h
similarity index 100%
rename from contrib/binutils/include/symcat.h
rename to x/binutils/include/symcat.h
diff --git a/contrib/binutils/include/ternary.h b/x/binutils/include/ternary.h
similarity index 100%
rename from contrib/binutils/include/ternary.h
rename to x/binutils/include/ternary.h
diff --git a/contrib/binutils/include/wait.h b/x/binutils/include/wait.h
similarity index 100%
rename from contrib/binutils/include/wait.h
rename to x/binutils/include/wait.h
diff --git a/contrib/binutils/include/xregex.h b/x/binutils/include/xregex.h
similarity index 100%
rename from contrib/binutils/include/xregex.h
rename to x/binutils/include/xregex.h
diff --git a/contrib/binutils/include/xregex2.h b/x/binutils/include/xregex2.h
similarity index 100%
rename from contrib/binutils/include/xregex2.h
rename to x/binutils/include/xregex2.h
diff --git a/contrib/binutils/install-sh b/x/binutils/install-sh
similarity index 100%
rename from contrib/binutils/install-sh
rename to x/binutils/install-sh
diff --git a/contrib/binutils/install.sh b/x/binutils/install.sh
similarity index 100%
rename from contrib/binutils/install.sh
rename to x/binutils/install.sh
diff --git a/contrib/binutils/ld/ChangeLog b/x/binutils/ld/ChangeLog
similarity index 100%
rename from contrib/binutils/ld/ChangeLog
rename to x/binutils/ld/ChangeLog
diff --git a/contrib/binutils/ld/ChangeLog-0001 b/x/binutils/ld/ChangeLog-0001
similarity index 100%
rename from contrib/binutils/ld/ChangeLog-0001
rename to x/binutils/ld/ChangeLog-0001
diff --git a/contrib/binutils/ld/ChangeLog-0203 b/x/binutils/ld/ChangeLog-0203
similarity index 100%
rename from contrib/binutils/ld/ChangeLog-0203
rename to x/binutils/ld/ChangeLog-0203
diff --git a/contrib/binutils/ld/ChangeLog-9197 b/x/binutils/ld/ChangeLog-9197
similarity index 100%
rename from contrib/binutils/ld/ChangeLog-9197
rename to x/binutils/ld/ChangeLog-9197
diff --git a/contrib/binutils/ld/ChangeLog-9899 b/x/binutils/ld/ChangeLog-9899
similarity index 100%
rename from contrib/binutils/ld/ChangeLog-9899
rename to x/binutils/ld/ChangeLog-9899
diff --git a/contrib/binutils/ld/MAINTAINERS b/x/binutils/ld/MAINTAINERS
similarity index 100%
rename from contrib/binutils/ld/MAINTAINERS
rename to x/binutils/ld/MAINTAINERS
diff --git a/contrib/binutils/ld/Makefile.am b/x/binutils/ld/Makefile.am
similarity index 100%
rename from contrib/binutils/ld/Makefile.am
rename to x/binutils/ld/Makefile.am
diff --git a/contrib/binutils/ld/Makefile.in b/x/binutils/ld/Makefile.in
similarity index 100%
rename from contrib/binutils/ld/Makefile.in
rename to x/binutils/ld/Makefile.in
diff --git a/contrib/binutils/ld/NEWS b/x/binutils/ld/NEWS
similarity index 100%
rename from contrib/binutils/ld/NEWS
rename to x/binutils/ld/NEWS
diff --git a/contrib/binutils/ld/README b/x/binutils/ld/README
similarity index 100%
rename from contrib/binutils/ld/README
rename to x/binutils/ld/README
diff --git a/contrib/binutils/ld/TODO b/x/binutils/ld/TODO
similarity index 100%
rename from contrib/binutils/ld/TODO
rename to x/binutils/ld/TODO
diff --git a/contrib/binutils/ld/acconfig.h b/x/binutils/ld/acconfig.h
similarity index 100%
rename from contrib/binutils/ld/acconfig.h
rename to x/binutils/ld/acconfig.h
diff --git a/contrib/binutils/ld/acinclude.m4 b/x/binutils/ld/acinclude.m4
similarity index 100%
rename from contrib/binutils/ld/acinclude.m4
rename to x/binutils/ld/acinclude.m4
diff --git a/contrib/binutils/ld/aclocal.m4 b/x/binutils/ld/aclocal.m4
similarity index 100%
rename from contrib/binutils/ld/aclocal.m4
rename to x/binutils/ld/aclocal.m4
diff --git a/contrib/binutils/ld/config.in b/x/binutils/ld/config.in
similarity index 100%
rename from contrib/binutils/ld/config.in
rename to x/binutils/ld/config.in
diff --git a/contrib/binutils/ld/configdoc.texi b/x/binutils/ld/configdoc.texi
similarity index 100%
rename from contrib/binutils/ld/configdoc.texi
rename to x/binutils/ld/configdoc.texi
diff --git a/contrib/binutils/ld/configure b/x/binutils/ld/configure
similarity index 100%
rename from contrib/binutils/ld/configure
rename to x/binutils/ld/configure
diff --git a/contrib/binutils/ld/configure.host b/x/binutils/ld/configure.host
similarity index 100%
rename from contrib/binutils/ld/configure.host
rename to x/binutils/ld/configure.host
diff --git a/contrib/binutils/ld/configure.in b/x/binutils/ld/configure.in
similarity index 100%
rename from contrib/binutils/ld/configure.in
rename to x/binutils/ld/configure.in
diff --git a/contrib/binutils/ld/configure.tgt b/x/binutils/ld/configure.tgt
similarity index 100%
rename from contrib/binutils/ld/configure.tgt
rename to x/binutils/ld/configure.tgt
diff --git a/contrib/binutils/ld/deffile.h b/x/binutils/ld/deffile.h
similarity index 100%
rename from contrib/binutils/ld/deffile.h
rename to x/binutils/ld/deffile.h
diff --git a/contrib/binutils/ld/deffilep.y b/x/binutils/ld/deffilep.y
similarity index 100%
rename from contrib/binutils/ld/deffilep.y
rename to x/binutils/ld/deffilep.y
diff --git a/contrib/binutils/ld/dep-in.sed b/x/binutils/ld/dep-in.sed
similarity index 100%
rename from contrib/binutils/ld/dep-in.sed
rename to x/binutils/ld/dep-in.sed
diff --git a/contrib/binutils/ld/emulparams/README b/x/binutils/ld/emulparams/README
similarity index 100%
rename from contrib/binutils/ld/emulparams/README
rename to x/binutils/ld/emulparams/README
diff --git a/contrib/binutils/ld/emulparams/alpha.sh b/x/binutils/ld/emulparams/alpha.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/alpha.sh
rename to x/binutils/ld/emulparams/alpha.sh
diff --git a/contrib/binutils/ld/emulparams/arcelf.sh b/x/binutils/ld/emulparams/arcelf.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/arcelf.sh
rename to x/binutils/ld/emulparams/arcelf.sh
diff --git a/contrib/binutils/ld/emulparams/armaoutb.sh b/x/binutils/ld/emulparams/armaoutb.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armaoutb.sh
rename to x/binutils/ld/emulparams/armaoutb.sh
diff --git a/contrib/binutils/ld/emulparams/armaoutl.sh b/x/binutils/ld/emulparams/armaoutl.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armaoutl.sh
rename to x/binutils/ld/emulparams/armaoutl.sh
diff --git a/contrib/binutils/ld/emulparams/armcoff.sh b/x/binutils/ld/emulparams/armcoff.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armcoff.sh
rename to x/binutils/ld/emulparams/armcoff.sh
diff --git a/contrib/binutils/ld/emulparams/armelf.sh b/x/binutils/ld/emulparams/armelf.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armelf.sh
rename to x/binutils/ld/emulparams/armelf.sh
diff --git a/contrib/binutils/ld/emulparams/armelf_fbsd.sh b/x/binutils/ld/emulparams/armelf_fbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armelf_fbsd.sh
rename to x/binutils/ld/emulparams/armelf_fbsd.sh
diff --git a/contrib/binutils/ld/emulparams/armelf_linux.sh b/x/binutils/ld/emulparams/armelf_linux.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armelf_linux.sh
rename to x/binutils/ld/emulparams/armelf_linux.sh
diff --git a/contrib/binutils/ld/emulparams/armelf_linux26.sh b/x/binutils/ld/emulparams/armelf_linux26.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armelf_linux26.sh
rename to x/binutils/ld/emulparams/armelf_linux26.sh
diff --git a/contrib/binutils/ld/emulparams/armelf_nbsd.sh b/x/binutils/ld/emulparams/armelf_nbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armelf_nbsd.sh
rename to x/binutils/ld/emulparams/armelf_nbsd.sh
diff --git a/contrib/binutils/ld/emulparams/armelf_oabi.sh b/x/binutils/ld/emulparams/armelf_oabi.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armelf_oabi.sh
rename to x/binutils/ld/emulparams/armelf_oabi.sh
diff --git a/contrib/binutils/ld/emulparams/armelfb_nbsd.sh b/x/binutils/ld/emulparams/armelfb_nbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armelfb_nbsd.sh
rename to x/binutils/ld/emulparams/armelfb_nbsd.sh
diff --git a/contrib/binutils/ld/emulparams/armnbsd.sh b/x/binutils/ld/emulparams/armnbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armnbsd.sh
rename to x/binutils/ld/emulparams/armnbsd.sh
diff --git a/contrib/binutils/ld/emulparams/armpe.sh b/x/binutils/ld/emulparams/armpe.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/armpe.sh
rename to x/binutils/ld/emulparams/armpe.sh
diff --git a/contrib/binutils/ld/emulparams/coff_sparc.sh b/x/binutils/ld/emulparams/coff_sparc.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/coff_sparc.sh
rename to x/binutils/ld/emulparams/coff_sparc.sh
diff --git a/contrib/binutils/ld/emulparams/elf32_sparc.sh b/x/binutils/ld/emulparams/elf32_sparc.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32_sparc.sh
rename to x/binutils/ld/emulparams/elf32_sparc.sh
diff --git a/contrib/binutils/ld/emulparams/elf32b4300.sh b/x/binutils/ld/emulparams/elf32b4300.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32b4300.sh
rename to x/binutils/ld/emulparams/elf32b4300.sh
diff --git a/contrib/binutils/ld/emulparams/elf32bmip.sh b/x/binutils/ld/emulparams/elf32bmip.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32bmip.sh
rename to x/binutils/ld/emulparams/elf32bmip.sh
diff --git a/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh b/x/binutils/ld/emulparams/elf32bmipn32-defs.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh
rename to x/binutils/ld/emulparams/elf32bmipn32-defs.sh
diff --git a/contrib/binutils/ld/emulparams/elf32bmipn32.sh b/x/binutils/ld/emulparams/elf32bmipn32.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32bmipn32.sh
rename to x/binutils/ld/emulparams/elf32bmipn32.sh
diff --git a/contrib/binutils/ld/emulparams/elf32bsmip.sh b/x/binutils/ld/emulparams/elf32bsmip.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32bsmip.sh
rename to x/binutils/ld/emulparams/elf32bsmip.sh
diff --git a/contrib/binutils/ld/emulparams/elf32btsmip.sh b/x/binutils/ld/emulparams/elf32btsmip.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32btsmip.sh
rename to x/binutils/ld/emulparams/elf32btsmip.sh
diff --git a/contrib/binutils/ld/emulparams/elf32btsmipn32.sh b/x/binutils/ld/emulparams/elf32btsmipn32.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32btsmipn32.sh
rename to x/binutils/ld/emulparams/elf32btsmipn32.sh
diff --git a/contrib/binutils/ld/emulparams/elf32ebmip.sh b/x/binutils/ld/emulparams/elf32ebmip.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32ebmip.sh
rename to x/binutils/ld/emulparams/elf32ebmip.sh
diff --git a/contrib/binutils/ld/emulparams/elf32elmip.sh b/x/binutils/ld/emulparams/elf32elmip.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32elmip.sh
rename to x/binutils/ld/emulparams/elf32elmip.sh
diff --git a/contrib/binutils/ld/emulparams/elf32l4300.sh b/x/binutils/ld/emulparams/elf32l4300.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32l4300.sh
rename to x/binutils/ld/emulparams/elf32l4300.sh
diff --git a/contrib/binutils/ld/emulparams/elf32lmip.sh b/x/binutils/ld/emulparams/elf32lmip.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32lmip.sh
rename to x/binutils/ld/emulparams/elf32lmip.sh
diff --git a/contrib/binutils/ld/emulparams/elf32lppc.sh b/x/binutils/ld/emulparams/elf32lppc.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32lppc.sh
rename to x/binutils/ld/emulparams/elf32lppc.sh
diff --git a/contrib/binutils/ld/emulparams/elf32lppcsim.sh b/x/binutils/ld/emulparams/elf32lppcsim.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32lppcsim.sh
rename to x/binutils/ld/emulparams/elf32lppcsim.sh
diff --git a/contrib/binutils/ld/emulparams/elf32lsmip.sh b/x/binutils/ld/emulparams/elf32lsmip.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32lsmip.sh
rename to x/binutils/ld/emulparams/elf32lsmip.sh
diff --git a/contrib/binutils/ld/emulparams/elf32ltsmip.sh b/x/binutils/ld/emulparams/elf32ltsmip.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32ltsmip.sh
rename to x/binutils/ld/emulparams/elf32ltsmip.sh
diff --git a/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh b/x/binutils/ld/emulparams/elf32ltsmipn32.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32ltsmipn32.sh
rename to x/binutils/ld/emulparams/elf32ltsmipn32.sh
diff --git a/contrib/binutils/ld/emulparams/elf32mipswindiss.sh b/x/binutils/ld/emulparams/elf32mipswindiss.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32mipswindiss.sh
rename to x/binutils/ld/emulparams/elf32mipswindiss.sh
diff --git a/contrib/binutils/ld/emulparams/elf32ppc.sh b/x/binutils/ld/emulparams/elf32ppc.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32ppc.sh
rename to x/binutils/ld/emulparams/elf32ppc.sh
diff --git a/contrib/binutils/ld/emulparams/elf32ppc_fbsd.sh b/x/binutils/ld/emulparams/elf32ppc_fbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32ppc_fbsd.sh
rename to x/binutils/ld/emulparams/elf32ppc_fbsd.sh
diff --git a/contrib/binutils/ld/emulparams/elf32ppclinux.sh b/x/binutils/ld/emulparams/elf32ppclinux.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32ppclinux.sh
rename to x/binutils/ld/emulparams/elf32ppclinux.sh
diff --git a/contrib/binutils/ld/emulparams/elf32ppcsim.sh b/x/binutils/ld/emulparams/elf32ppcsim.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf32ppcsim.sh
rename to x/binutils/ld/emulparams/elf32ppcsim.sh
diff --git a/contrib/binutils/ld/emulparams/elf64_ia64.sh b/x/binutils/ld/emulparams/elf64_ia64.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64_ia64.sh
rename to x/binutils/ld/emulparams/elf64_ia64.sh
diff --git a/contrib/binutils/ld/emulparams/elf64_ia64_fbsd.sh b/x/binutils/ld/emulparams/elf64_ia64_fbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64_ia64_fbsd.sh
rename to x/binutils/ld/emulparams/elf64_ia64_fbsd.sh
diff --git a/contrib/binutils/ld/emulparams/elf64_s390.sh b/x/binutils/ld/emulparams/elf64_s390.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64_s390.sh
rename to x/binutils/ld/emulparams/elf64_s390.sh
diff --git a/contrib/binutils/ld/emulparams/elf64_sparc.sh b/x/binutils/ld/emulparams/elf64_sparc.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64_sparc.sh
rename to x/binutils/ld/emulparams/elf64_sparc.sh
diff --git a/contrib/binutils/ld/emulparams/elf64_sparc_fbsd.sh b/x/binutils/ld/emulparams/elf64_sparc_fbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64_sparc_fbsd.sh
rename to x/binutils/ld/emulparams/elf64_sparc_fbsd.sh
diff --git a/contrib/binutils/ld/emulparams/elf64alpha.sh b/x/binutils/ld/emulparams/elf64alpha.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64alpha.sh
rename to x/binutils/ld/emulparams/elf64alpha.sh
diff --git a/contrib/binutils/ld/emulparams/elf64alpha_fbsd.sh b/x/binutils/ld/emulparams/elf64alpha_fbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64alpha_fbsd.sh
rename to x/binutils/ld/emulparams/elf64alpha_fbsd.sh
diff --git a/contrib/binutils/ld/emulparams/elf64alpha_nbsd.sh b/x/binutils/ld/emulparams/elf64alpha_nbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64alpha_nbsd.sh
rename to x/binutils/ld/emulparams/elf64alpha_nbsd.sh
diff --git a/contrib/binutils/ld/emulparams/elf64bmip.sh b/x/binutils/ld/emulparams/elf64bmip.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64bmip.sh
rename to x/binutils/ld/emulparams/elf64bmip.sh
diff --git a/contrib/binutils/ld/emulparams/elf64btsmip.sh b/x/binutils/ld/emulparams/elf64btsmip.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64btsmip.sh
rename to x/binutils/ld/emulparams/elf64btsmip.sh
diff --git a/contrib/binutils/ld/emulparams/elf64lppc.sh b/x/binutils/ld/emulparams/elf64lppc.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64lppc.sh
rename to x/binutils/ld/emulparams/elf64lppc.sh
diff --git a/contrib/binutils/ld/emulparams/elf64ltsmip.sh b/x/binutils/ld/emulparams/elf64ltsmip.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64ltsmip.sh
rename to x/binutils/ld/emulparams/elf64ltsmip.sh
diff --git a/contrib/binutils/ld/emulparams/elf64ppc.sh b/x/binutils/ld/emulparams/elf64ppc.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf64ppc.sh
rename to x/binutils/ld/emulparams/elf64ppc.sh
diff --git a/contrib/binutils/ld/emulparams/elf_fbsd.sh b/x/binutils/ld/emulparams/elf_fbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf_fbsd.sh
rename to x/binutils/ld/emulparams/elf_fbsd.sh
diff --git a/contrib/binutils/ld/emulparams/elf_i386.sh b/x/binutils/ld/emulparams/elf_i386.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf_i386.sh
rename to x/binutils/ld/emulparams/elf_i386.sh
diff --git a/contrib/binutils/ld/emulparams/elf_i386_chaos.sh b/x/binutils/ld/emulparams/elf_i386_chaos.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf_i386_chaos.sh
rename to x/binutils/ld/emulparams/elf_i386_chaos.sh
diff --git a/contrib/binutils/ld/emulparams/elf_i386_fbsd.sh b/x/binutils/ld/emulparams/elf_i386_fbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf_i386_fbsd.sh
rename to x/binutils/ld/emulparams/elf_i386_fbsd.sh
diff --git a/contrib/binutils/ld/emulparams/elf_i386_ldso.sh b/x/binutils/ld/emulparams/elf_i386_ldso.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf_i386_ldso.sh
rename to x/binutils/ld/emulparams/elf_i386_ldso.sh
diff --git a/contrib/binutils/ld/emulparams/elf_s390.sh b/x/binutils/ld/emulparams/elf_s390.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf_s390.sh
rename to x/binutils/ld/emulparams/elf_s390.sh
diff --git a/contrib/binutils/ld/emulparams/elf_x86_64.sh b/x/binutils/ld/emulparams/elf_x86_64.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf_x86_64.sh
rename to x/binutils/ld/emulparams/elf_x86_64.sh
diff --git a/contrib/binutils/ld/emulparams/elf_x86_64_fbsd.sh b/x/binutils/ld/emulparams/elf_x86_64_fbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/elf_x86_64_fbsd.sh
rename to x/binutils/ld/emulparams/elf_x86_64_fbsd.sh
diff --git a/contrib/binutils/ld/emulparams/i386aout.sh b/x/binutils/ld/emulparams/i386aout.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/i386aout.sh
rename to x/binutils/ld/emulparams/i386aout.sh
diff --git a/contrib/binutils/ld/emulparams/i386bsd.sh b/x/binutils/ld/emulparams/i386bsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/i386bsd.sh
rename to x/binutils/ld/emulparams/i386bsd.sh
diff --git a/contrib/binutils/ld/emulparams/i386coff.sh b/x/binutils/ld/emulparams/i386coff.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/i386coff.sh
rename to x/binutils/ld/emulparams/i386coff.sh
diff --git a/contrib/binutils/ld/emulparams/i386linux.sh b/x/binutils/ld/emulparams/i386linux.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/i386linux.sh
rename to x/binutils/ld/emulparams/i386linux.sh
diff --git a/contrib/binutils/ld/emulparams/i386moss.sh b/x/binutils/ld/emulparams/i386moss.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/i386moss.sh
rename to x/binutils/ld/emulparams/i386moss.sh
diff --git a/contrib/binutils/ld/emulparams/i386nbsd.sh b/x/binutils/ld/emulparams/i386nbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/i386nbsd.sh
rename to x/binutils/ld/emulparams/i386nbsd.sh
diff --git a/contrib/binutils/ld/emulparams/i386nto.sh b/x/binutils/ld/emulparams/i386nto.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/i386nto.sh
rename to x/binutils/ld/emulparams/i386nto.sh
diff --git a/contrib/binutils/ld/emulparams/i386nw.sh b/x/binutils/ld/emulparams/i386nw.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/i386nw.sh
rename to x/binutils/ld/emulparams/i386nw.sh
diff --git a/contrib/binutils/ld/emulparams/i386pe.sh b/x/binutils/ld/emulparams/i386pe.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/i386pe.sh
rename to x/binutils/ld/emulparams/i386pe.sh
diff --git a/contrib/binutils/ld/emulparams/i386pe_posix.sh b/x/binutils/ld/emulparams/i386pe_posix.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/i386pe_posix.sh
rename to x/binutils/ld/emulparams/i386pe_posix.sh
diff --git a/contrib/binutils/ld/emulparams/mipsbig.sh b/x/binutils/ld/emulparams/mipsbig.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/mipsbig.sh
rename to x/binutils/ld/emulparams/mipsbig.sh
diff --git a/contrib/binutils/ld/emulparams/mipsbsd.sh b/x/binutils/ld/emulparams/mipsbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/mipsbsd.sh
rename to x/binutils/ld/emulparams/mipsbsd.sh
diff --git a/contrib/binutils/ld/emulparams/mipsidt.sh b/x/binutils/ld/emulparams/mipsidt.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/mipsidt.sh
rename to x/binutils/ld/emulparams/mipsidt.sh
diff --git a/contrib/binutils/ld/emulparams/mipsidtl.sh b/x/binutils/ld/emulparams/mipsidtl.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/mipsidtl.sh
rename to x/binutils/ld/emulparams/mipsidtl.sh
diff --git a/contrib/binutils/ld/emulparams/mipslit.sh b/x/binutils/ld/emulparams/mipslit.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/mipslit.sh
rename to x/binutils/ld/emulparams/mipslit.sh
diff --git a/contrib/binutils/ld/emulparams/mipslnews.sh b/x/binutils/ld/emulparams/mipslnews.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/mipslnews.sh
rename to x/binutils/ld/emulparams/mipslnews.sh
diff --git a/contrib/binutils/ld/emulparams/mipspe.sh b/x/binutils/ld/emulparams/mipspe.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/mipspe.sh
rename to x/binutils/ld/emulparams/mipspe.sh
diff --git a/contrib/binutils/ld/emulparams/ppcmacos.sh b/x/binutils/ld/emulparams/ppcmacos.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/ppcmacos.sh
rename to x/binutils/ld/emulparams/ppcmacos.sh
diff --git a/contrib/binutils/ld/emulparams/ppcnw.sh b/x/binutils/ld/emulparams/ppcnw.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/ppcnw.sh
rename to x/binutils/ld/emulparams/ppcnw.sh
diff --git a/contrib/binutils/ld/emulparams/ppcpe.sh b/x/binutils/ld/emulparams/ppcpe.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/ppcpe.sh
rename to x/binutils/ld/emulparams/ppcpe.sh
diff --git a/contrib/binutils/ld/emulparams/sh.sh b/x/binutils/ld/emulparams/sh.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/sh.sh
rename to x/binutils/ld/emulparams/sh.sh
diff --git a/contrib/binutils/ld/emulparams/shl.sh b/x/binutils/ld/emulparams/shl.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/shl.sh
rename to x/binutils/ld/emulparams/shl.sh
diff --git a/contrib/binutils/ld/emulparams/shlelf.sh b/x/binutils/ld/emulparams/shlelf.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/shlelf.sh
rename to x/binutils/ld/emulparams/shlelf.sh
diff --git a/contrib/binutils/ld/emulparams/sparcaout.sh b/x/binutils/ld/emulparams/sparcaout.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/sparcaout.sh
rename to x/binutils/ld/emulparams/sparcaout.sh
diff --git a/contrib/binutils/ld/emulparams/sparclinux.sh b/x/binutils/ld/emulparams/sparclinux.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/sparclinux.sh
rename to x/binutils/ld/emulparams/sparclinux.sh
diff --git a/contrib/binutils/ld/emulparams/sparcnbsd.sh b/x/binutils/ld/emulparams/sparcnbsd.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/sparcnbsd.sh
rename to x/binutils/ld/emulparams/sparcnbsd.sh
diff --git a/contrib/binutils/ld/emulparams/sun4.sh b/x/binutils/ld/emulparams/sun4.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/sun4.sh
rename to x/binutils/ld/emulparams/sun4.sh
diff --git a/contrib/binutils/ld/emulparams/vanilla.sh b/x/binutils/ld/emulparams/vanilla.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/vanilla.sh
rename to x/binutils/ld/emulparams/vanilla.sh
diff --git a/contrib/binutils/ld/emulparams/vsta.sh b/x/binutils/ld/emulparams/vsta.sh
similarity index 100%
rename from contrib/binutils/ld/emulparams/vsta.sh
rename to x/binutils/ld/emulparams/vsta.sh
diff --git a/contrib/binutils/ld/emultempl/README b/x/binutils/ld/emultempl/README
similarity index 100%
rename from contrib/binutils/ld/emultempl/README
rename to x/binutils/ld/emultempl/README
diff --git a/contrib/binutils/ld/emultempl/alphaelf.em b/x/binutils/ld/emultempl/alphaelf.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/alphaelf.em
rename to x/binutils/ld/emultempl/alphaelf.em
diff --git a/contrib/binutils/ld/emultempl/armcoff.em b/x/binutils/ld/emultempl/armcoff.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/armcoff.em
rename to x/binutils/ld/emultempl/armcoff.em
diff --git a/contrib/binutils/ld/emultempl/armelf.em b/x/binutils/ld/emultempl/armelf.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/armelf.em
rename to x/binutils/ld/emultempl/armelf.em
diff --git a/contrib/binutils/ld/emultempl/armelf_oabi.em b/x/binutils/ld/emultempl/armelf_oabi.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/armelf_oabi.em
rename to x/binutils/ld/emultempl/armelf_oabi.em
diff --git a/contrib/binutils/ld/emultempl/astring.sed b/x/binutils/ld/emultempl/astring.sed
similarity index 100%
rename from contrib/binutils/ld/emultempl/astring.sed
rename to x/binutils/ld/emultempl/astring.sed
diff --git a/contrib/binutils/ld/emultempl/elf32.em b/x/binutils/ld/emultempl/elf32.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/elf32.em
rename to x/binutils/ld/emultempl/elf32.em
diff --git a/contrib/binutils/ld/emultempl/generic.em b/x/binutils/ld/emultempl/generic.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/generic.em
rename to x/binutils/ld/emultempl/generic.em
diff --git a/contrib/binutils/ld/emultempl/ia64elf.em b/x/binutils/ld/emultempl/ia64elf.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/ia64elf.em
rename to x/binutils/ld/emultempl/ia64elf.em
diff --git a/contrib/binutils/ld/emultempl/linux.em b/x/binutils/ld/emultempl/linux.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/linux.em
rename to x/binutils/ld/emultempl/linux.em
diff --git a/contrib/binutils/ld/emultempl/mipsecoff.em b/x/binutils/ld/emultempl/mipsecoff.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/mipsecoff.em
rename to x/binutils/ld/emultempl/mipsecoff.em
diff --git a/contrib/binutils/ld/emultempl/mipself.em b/x/binutils/ld/emultempl/mipself.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/mipself.em
rename to x/binutils/ld/emultempl/mipself.em
diff --git a/contrib/binutils/ld/emultempl/needrelax.em b/x/binutils/ld/emultempl/needrelax.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/needrelax.em
rename to x/binutils/ld/emultempl/needrelax.em
diff --git a/contrib/binutils/ld/emultempl/netbsd.em b/x/binutils/ld/emultempl/netbsd.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/netbsd.em
rename to x/binutils/ld/emultempl/netbsd.em
diff --git a/contrib/binutils/ld/emultempl/ostring.sed b/x/binutils/ld/emultempl/ostring.sed
similarity index 100%
rename from contrib/binutils/ld/emultempl/ostring.sed
rename to x/binutils/ld/emultempl/ostring.sed
diff --git a/contrib/binutils/ld/emultempl/pe.em b/x/binutils/ld/emultempl/pe.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/pe.em
rename to x/binutils/ld/emultempl/pe.em
diff --git a/contrib/binutils/ld/emultempl/ppc32elf.em b/x/binutils/ld/emultempl/ppc32elf.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/ppc32elf.em
rename to x/binutils/ld/emultempl/ppc32elf.em
diff --git a/contrib/binutils/ld/emultempl/ppc64elf.em b/x/binutils/ld/emultempl/ppc64elf.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/ppc64elf.em
rename to x/binutils/ld/emultempl/ppc64elf.em
diff --git a/contrib/binutils/ld/emultempl/stringify.sed b/x/binutils/ld/emultempl/stringify.sed
similarity index 100%
rename from contrib/binutils/ld/emultempl/stringify.sed
rename to x/binutils/ld/emultempl/stringify.sed
diff --git a/contrib/binutils/ld/emultempl/sunos.em b/x/binutils/ld/emultempl/sunos.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/sunos.em
rename to x/binutils/ld/emultempl/sunos.em
diff --git a/contrib/binutils/ld/emultempl/ticoff.em b/x/binutils/ld/emultempl/ticoff.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/ticoff.em
rename to x/binutils/ld/emultempl/ticoff.em
diff --git a/contrib/binutils/ld/emultempl/vanilla.em b/x/binutils/ld/emultempl/vanilla.em
similarity index 100%
rename from contrib/binutils/ld/emultempl/vanilla.em
rename to x/binutils/ld/emultempl/vanilla.em
diff --git a/contrib/binutils/ld/fdl.texi b/x/binutils/ld/fdl.texi
similarity index 100%
rename from contrib/binutils/ld/fdl.texi
rename to x/binutils/ld/fdl.texi
diff --git a/contrib/binutils/ld/gen-doc.texi b/x/binutils/ld/gen-doc.texi
similarity index 100%
rename from contrib/binutils/ld/gen-doc.texi
rename to x/binutils/ld/gen-doc.texi
diff --git a/contrib/binutils/ld/genscripts.sh b/x/binutils/ld/genscripts.sh
similarity index 100%
rename from contrib/binutils/ld/genscripts.sh
rename to x/binutils/ld/genscripts.sh
diff --git a/contrib/binutils/ld/h8-doc.texi b/x/binutils/ld/h8-doc.texi
similarity index 100%
rename from contrib/binutils/ld/h8-doc.texi
rename to x/binutils/ld/h8-doc.texi
diff --git a/contrib/binutils/ld/ld.1 b/x/binutils/ld/ld.1
similarity index 100%
rename from contrib/binutils/ld/ld.1
rename to x/binutils/ld/ld.1
diff --git a/contrib/binutils/ld/ld.h b/x/binutils/ld/ld.h
similarity index 100%
rename from contrib/binutils/ld/ld.h
rename to x/binutils/ld/ld.h
diff --git a/contrib/binutils/ld/ld.texinfo b/x/binutils/ld/ld.texinfo
similarity index 100%
rename from contrib/binutils/ld/ld.texinfo
rename to x/binutils/ld/ld.texinfo
diff --git a/contrib/binutils/ld/ldcref.c b/x/binutils/ld/ldcref.c
similarity index 100%
rename from contrib/binutils/ld/ldcref.c
rename to x/binutils/ld/ldcref.c
diff --git a/contrib/binutils/ld/ldctor.c b/x/binutils/ld/ldctor.c
similarity index 100%
rename from contrib/binutils/ld/ldctor.c
rename to x/binutils/ld/ldctor.c
diff --git a/contrib/binutils/ld/ldctor.h b/x/binutils/ld/ldctor.h
similarity index 100%
rename from contrib/binutils/ld/ldctor.h
rename to x/binutils/ld/ldctor.h
diff --git a/contrib/binutils/ld/ldemul.c b/x/binutils/ld/ldemul.c
similarity index 100%
rename from contrib/binutils/ld/ldemul.c
rename to x/binutils/ld/ldemul.c
diff --git a/contrib/binutils/ld/ldemul.h b/x/binutils/ld/ldemul.h
similarity index 100%
rename from contrib/binutils/ld/ldemul.h
rename to x/binutils/ld/ldemul.h
diff --git a/contrib/binutils/ld/ldexp.c b/x/binutils/ld/ldexp.c
similarity index 100%
rename from contrib/binutils/ld/ldexp.c
rename to x/binutils/ld/ldexp.c
diff --git a/contrib/binutils/ld/ldexp.h b/x/binutils/ld/ldexp.h
similarity index 100%
rename from contrib/binutils/ld/ldexp.h
rename to x/binutils/ld/ldexp.h
diff --git a/contrib/binutils/ld/ldfile.c b/x/binutils/ld/ldfile.c
similarity index 100%
rename from contrib/binutils/ld/ldfile.c
rename to x/binutils/ld/ldfile.c
diff --git a/contrib/binutils/ld/ldfile.h b/x/binutils/ld/ldfile.h
similarity index 100%
rename from contrib/binutils/ld/ldfile.h
rename to x/binutils/ld/ldfile.h
diff --git a/contrib/binutils/ld/ldgram.y b/x/binutils/ld/ldgram.y
similarity index 100%
rename from contrib/binutils/ld/ldgram.y
rename to x/binutils/ld/ldgram.y
diff --git a/contrib/binutils/ld/ldint.texinfo b/x/binutils/ld/ldint.texinfo
similarity index 100%
rename from contrib/binutils/ld/ldint.texinfo
rename to x/binutils/ld/ldint.texinfo
diff --git a/contrib/binutils/ld/ldlang.c b/x/binutils/ld/ldlang.c
similarity index 100%
rename from contrib/binutils/ld/ldlang.c
rename to x/binutils/ld/ldlang.c
diff --git a/contrib/binutils/ld/ldlang.h b/x/binutils/ld/ldlang.h
similarity index 100%
rename from contrib/binutils/ld/ldlang.h
rename to x/binutils/ld/ldlang.h
diff --git a/contrib/binutils/ld/ldlex.h b/x/binutils/ld/ldlex.h
similarity index 100%
rename from contrib/binutils/ld/ldlex.h
rename to x/binutils/ld/ldlex.h
diff --git a/contrib/binutils/ld/ldlex.l b/x/binutils/ld/ldlex.l
similarity index 100%
rename from contrib/binutils/ld/ldlex.l
rename to x/binutils/ld/ldlex.l
diff --git a/contrib/binutils/ld/ldmain.c b/x/binutils/ld/ldmain.c
similarity index 100%
rename from contrib/binutils/ld/ldmain.c
rename to x/binutils/ld/ldmain.c
diff --git a/contrib/binutils/ld/ldmain.h b/x/binutils/ld/ldmain.h
similarity index 100%
rename from contrib/binutils/ld/ldmain.h
rename to x/binutils/ld/ldmain.h
diff --git a/contrib/binutils/ld/ldmisc.c b/x/binutils/ld/ldmisc.c
similarity index 100%
rename from contrib/binutils/ld/ldmisc.c
rename to x/binutils/ld/ldmisc.c
diff --git a/contrib/binutils/ld/ldmisc.h b/x/binutils/ld/ldmisc.h
similarity index 100%
rename from contrib/binutils/ld/ldmisc.h
rename to x/binutils/ld/ldmisc.h
diff --git a/contrib/binutils/ld/ldver.c b/x/binutils/ld/ldver.c
similarity index 100%
rename from contrib/binutils/ld/ldver.c
rename to x/binutils/ld/ldver.c
diff --git a/contrib/binutils/ld/ldver.h b/x/binutils/ld/ldver.h
similarity index 100%
rename from contrib/binutils/ld/ldver.h
rename to x/binutils/ld/ldver.h
diff --git a/contrib/binutils/ld/ldver.texi b/x/binutils/ld/ldver.texi
similarity index 100%
rename from contrib/binutils/ld/ldver.texi
rename to x/binutils/ld/ldver.texi
diff --git a/contrib/binutils/ld/ldwrite.c b/x/binutils/ld/ldwrite.c
similarity index 100%
rename from contrib/binutils/ld/ldwrite.c
rename to x/binutils/ld/ldwrite.c
diff --git a/contrib/binutils/ld/ldwrite.h b/x/binutils/ld/ldwrite.h
similarity index 100%
rename from contrib/binutils/ld/ldwrite.h
rename to x/binutils/ld/ldwrite.h
diff --git a/contrib/binutils/ld/lexsup.c b/x/binutils/ld/lexsup.c
similarity index 100%
rename from contrib/binutils/ld/lexsup.c
rename to x/binutils/ld/lexsup.c
diff --git a/contrib/binutils/ld/mri.c b/x/binutils/ld/mri.c
similarity index 100%
rename from contrib/binutils/ld/mri.c
rename to x/binutils/ld/mri.c
diff --git a/contrib/binutils/ld/mri.h b/x/binutils/ld/mri.h
similarity index 100%
rename from contrib/binutils/ld/mri.h
rename to x/binutils/ld/mri.h
diff --git a/contrib/binutils/ld/pe-dll.c b/x/binutils/ld/pe-dll.c
similarity index 100%
rename from contrib/binutils/ld/pe-dll.c
rename to x/binutils/ld/pe-dll.c
diff --git a/contrib/binutils/ld/pe-dll.h b/x/binutils/ld/pe-dll.h
similarity index 100%
rename from contrib/binutils/ld/pe-dll.h
rename to x/binutils/ld/pe-dll.h
diff --git a/contrib/binutils/ld/po/Make-in b/x/binutils/ld/po/Make-in
similarity index 100%
rename from contrib/binutils/ld/po/Make-in
rename to x/binutils/ld/po/Make-in
diff --git a/contrib/binutils/ld/po/POTFILES.in b/x/binutils/ld/po/POTFILES.in
similarity index 100%
rename from contrib/binutils/ld/po/POTFILES.in
rename to x/binutils/ld/po/POTFILES.in
diff --git a/contrib/binutils/ld/po/ld.pot b/x/binutils/ld/po/ld.pot
similarity index 100%
rename from contrib/binutils/ld/po/ld.pot
rename to x/binutils/ld/po/ld.pot
diff --git a/contrib/binutils/ld/scripttempl/README b/x/binutils/ld/scripttempl/README
similarity index 100%
rename from contrib/binutils/ld/scripttempl/README
rename to x/binutils/ld/scripttempl/README
diff --git a/contrib/binutils/ld/scripttempl/alpha.sc b/x/binutils/ld/scripttempl/alpha.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/alpha.sc
rename to x/binutils/ld/scripttempl/alpha.sc
diff --git a/contrib/binutils/ld/scripttempl/aout.sc b/x/binutils/ld/scripttempl/aout.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/aout.sc
rename to x/binutils/ld/scripttempl/aout.sc
diff --git a/contrib/binutils/ld/scripttempl/armaout.sc b/x/binutils/ld/scripttempl/armaout.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/armaout.sc
rename to x/binutils/ld/scripttempl/armaout.sc
diff --git a/contrib/binutils/ld/scripttempl/armcoff.sc b/x/binutils/ld/scripttempl/armcoff.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/armcoff.sc
rename to x/binutils/ld/scripttempl/armcoff.sc
diff --git a/contrib/binutils/ld/scripttempl/elf.sc b/x/binutils/ld/scripttempl/elf.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/elf.sc
rename to x/binutils/ld/scripttempl/elf.sc
diff --git a/contrib/binutils/ld/scripttempl/elfppc.sc b/x/binutils/ld/scripttempl/elfppc.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/elfppc.sc
rename to x/binutils/ld/scripttempl/elfppc.sc
diff --git a/contrib/binutils/ld/scripttempl/i386coff.sc b/x/binutils/ld/scripttempl/i386coff.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/i386coff.sc
rename to x/binutils/ld/scripttempl/i386coff.sc
diff --git a/contrib/binutils/ld/scripttempl/mips.sc b/x/binutils/ld/scripttempl/mips.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/mips.sc
rename to x/binutils/ld/scripttempl/mips.sc
diff --git a/contrib/binutils/ld/scripttempl/mipsbsd.sc b/x/binutils/ld/scripttempl/mipsbsd.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/mipsbsd.sc
rename to x/binutils/ld/scripttempl/mipsbsd.sc
diff --git a/contrib/binutils/ld/scripttempl/nw.sc b/x/binutils/ld/scripttempl/nw.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/nw.sc
rename to x/binutils/ld/scripttempl/nw.sc
diff --git a/contrib/binutils/ld/scripttempl/pe.sc b/x/binutils/ld/scripttempl/pe.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/pe.sc
rename to x/binutils/ld/scripttempl/pe.sc
diff --git a/contrib/binutils/ld/scripttempl/ppcpe.sc b/x/binutils/ld/scripttempl/ppcpe.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/ppcpe.sc
rename to x/binutils/ld/scripttempl/ppcpe.sc
diff --git a/contrib/binutils/ld/scripttempl/sh.sc b/x/binutils/ld/scripttempl/sh.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/sh.sc
rename to x/binutils/ld/scripttempl/sh.sc
diff --git a/contrib/binutils/ld/scripttempl/sparccoff.sc b/x/binutils/ld/scripttempl/sparccoff.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/sparccoff.sc
rename to x/binutils/ld/scripttempl/sparccoff.sc
diff --git a/contrib/binutils/ld/scripttempl/tic30aout.sc b/x/binutils/ld/scripttempl/tic30aout.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/tic30aout.sc
rename to x/binutils/ld/scripttempl/tic30aout.sc
diff --git a/contrib/binutils/ld/scripttempl/tic30coff.sc b/x/binutils/ld/scripttempl/tic30coff.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/tic30coff.sc
rename to x/binutils/ld/scripttempl/tic30coff.sc
diff --git a/contrib/binutils/ld/scripttempl/v850.sc b/x/binutils/ld/scripttempl/v850.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/v850.sc
rename to x/binutils/ld/scripttempl/v850.sc
diff --git a/contrib/binutils/ld/scripttempl/vanilla.sc b/x/binutils/ld/scripttempl/vanilla.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/vanilla.sc
rename to x/binutils/ld/scripttempl/vanilla.sc
diff --git a/contrib/binutils/ld/scripttempl/z8000.sc b/x/binutils/ld/scripttempl/z8000.sc
similarity index 100%
rename from contrib/binutils/ld/scripttempl/z8000.sc
rename to x/binutils/ld/scripttempl/z8000.sc
diff --git a/contrib/binutils/ld/stamp-h.in b/x/binutils/ld/stamp-h.in
similarity index 100%
rename from contrib/binutils/ld/stamp-h.in
rename to x/binutils/ld/stamp-h.in
diff --git a/contrib/binutils/ld/sysdep.h b/x/binutils/ld/sysdep.h
similarity index 100%
rename from contrib/binutils/ld/sysdep.h
rename to x/binutils/ld/sysdep.h
diff --git a/contrib/binutils/libiberty/ChangeLog b/x/binutils/libiberty/ChangeLog
similarity index 100%
rename from contrib/binutils/libiberty/ChangeLog
rename to x/binutils/libiberty/ChangeLog
diff --git a/contrib/binutils/libiberty/Makefile.in b/x/binutils/libiberty/Makefile.in
similarity index 100%
rename from contrib/binutils/libiberty/Makefile.in
rename to x/binutils/libiberty/Makefile.in
diff --git a/contrib/binutils/libiberty/README b/x/binutils/libiberty/README
similarity index 100%
rename from contrib/binutils/libiberty/README
rename to x/binutils/libiberty/README
diff --git a/contrib/binutils/libiberty/_doprnt.c b/x/binutils/libiberty/_doprnt.c
similarity index 100%
rename from contrib/binutils/libiberty/_doprnt.c
rename to x/binutils/libiberty/_doprnt.c
diff --git a/contrib/binutils/libiberty/acconfig.h b/x/binutils/libiberty/acconfig.h
similarity index 100%
rename from contrib/binutils/libiberty/acconfig.h
rename to x/binutils/libiberty/acconfig.h
diff --git a/contrib/binutils/libiberty/aclocal.m4 b/x/binutils/libiberty/aclocal.m4
similarity index 100%
rename from contrib/binutils/libiberty/aclocal.m4
rename to x/binutils/libiberty/aclocal.m4
diff --git a/contrib/binutils/libiberty/alloca-botch.h b/x/binutils/libiberty/alloca-botch.h
similarity index 100%
rename from contrib/binutils/libiberty/alloca-botch.h
rename to x/binutils/libiberty/alloca-botch.h
diff --git a/contrib/binutils/libiberty/alloca-conf.h b/x/binutils/libiberty/alloca-conf.h
similarity index 100%
rename from contrib/binutils/libiberty/alloca-conf.h
rename to x/binutils/libiberty/alloca-conf.h
diff --git a/contrib/binutils/libiberty/alloca-norm.h b/x/binutils/libiberty/alloca-norm.h
similarity index 100%
rename from contrib/binutils/libiberty/alloca-norm.h
rename to x/binutils/libiberty/alloca-norm.h
diff --git a/contrib/binutils/libiberty/alloca.c b/x/binutils/libiberty/alloca.c
similarity index 100%
rename from contrib/binutils/libiberty/alloca.c
rename to x/binutils/libiberty/alloca.c
diff --git a/contrib/binutils/libiberty/argv.c b/x/binutils/libiberty/argv.c
similarity index 100%
rename from contrib/binutils/libiberty/argv.c
rename to x/binutils/libiberty/argv.c
diff --git a/contrib/binutils/libiberty/asprintf.c b/x/binutils/libiberty/asprintf.c
similarity index 100%
rename from contrib/binutils/libiberty/asprintf.c
rename to x/binutils/libiberty/asprintf.c
diff --git a/contrib/binutils/libiberty/atexit.c b/x/binutils/libiberty/atexit.c
similarity index 100%
rename from contrib/binutils/libiberty/atexit.c
rename to x/binutils/libiberty/atexit.c
diff --git a/contrib/binutils/libiberty/basename.c b/x/binutils/libiberty/basename.c
similarity index 100%
rename from contrib/binutils/libiberty/basename.c
rename to x/binutils/libiberty/basename.c
diff --git a/contrib/binutils/libiberty/bcmp.c b/x/binutils/libiberty/bcmp.c
similarity index 100%
rename from contrib/binutils/libiberty/bcmp.c
rename to x/binutils/libiberty/bcmp.c
diff --git a/contrib/binutils/libiberty/bcopy.c b/x/binutils/libiberty/bcopy.c
similarity index 100%
rename from contrib/binutils/libiberty/bcopy.c
rename to x/binutils/libiberty/bcopy.c
diff --git a/contrib/binutils/libiberty/bsearch.c b/x/binutils/libiberty/bsearch.c
similarity index 100%
rename from contrib/binutils/libiberty/bsearch.c
rename to x/binutils/libiberty/bsearch.c
diff --git a/contrib/binutils/libiberty/bzero.c b/x/binutils/libiberty/bzero.c
similarity index 100%
rename from contrib/binutils/libiberty/bzero.c
rename to x/binutils/libiberty/bzero.c
diff --git a/contrib/binutils/libiberty/calloc.c b/x/binutils/libiberty/calloc.c
similarity index 100%
rename from contrib/binutils/libiberty/calloc.c
rename to x/binutils/libiberty/calloc.c
diff --git a/contrib/binutils/libiberty/choose-temp.c b/x/binutils/libiberty/choose-temp.c
similarity index 100%
rename from contrib/binutils/libiberty/choose-temp.c
rename to x/binutils/libiberty/choose-temp.c
diff --git a/contrib/binutils/libiberty/clock.c b/x/binutils/libiberty/clock.c
similarity index 100%
rename from contrib/binutils/libiberty/clock.c
rename to x/binutils/libiberty/clock.c
diff --git a/contrib/binutils/libiberty/concat.c b/x/binutils/libiberty/concat.c
similarity index 100%
rename from contrib/binutils/libiberty/concat.c
rename to x/binutils/libiberty/concat.c
diff --git a/contrib/binutils/libiberty/config.in b/x/binutils/libiberty/config.in
similarity index 100%
rename from contrib/binutils/libiberty/config.in
rename to x/binutils/libiberty/config.in
diff --git a/contrib/binutils/libiberty/config.table b/x/binutils/libiberty/config.table
similarity index 100%
rename from contrib/binutils/libiberty/config.table
rename to x/binutils/libiberty/config.table
diff --git a/contrib/binutils/libiberty/config/mh-cxux7 b/x/binutils/libiberty/config/mh-cxux7
similarity index 100%
rename from contrib/binutils/libiberty/config/mh-cxux7
rename to x/binutils/libiberty/config/mh-cxux7
diff --git a/contrib/binutils/libiberty/config/mh-fbsd21 b/x/binutils/libiberty/config/mh-fbsd21
similarity index 100%
rename from contrib/binutils/libiberty/config/mh-fbsd21
rename to x/binutils/libiberty/config/mh-fbsd21
diff --git a/contrib/binutils/libiberty/config/mh-openedition b/x/binutils/libiberty/config/mh-openedition
similarity index 100%
rename from contrib/binutils/libiberty/config/mh-openedition
rename to x/binutils/libiberty/config/mh-openedition
diff --git a/contrib/binutils/libiberty/config/mh-sysv b/x/binutils/libiberty/config/mh-sysv
similarity index 100%
rename from contrib/binutils/libiberty/config/mh-sysv
rename to x/binutils/libiberty/config/mh-sysv
diff --git a/contrib/binutils/libiberty/config/mh-sysv4 b/x/binutils/libiberty/config/mh-sysv4
similarity index 100%
rename from contrib/binutils/libiberty/config/mh-sysv4
rename to x/binutils/libiberty/config/mh-sysv4
diff --git a/contrib/binutils/libiberty/config/mt-mingw32 b/x/binutils/libiberty/config/mt-mingw32
similarity index 100%
rename from contrib/binutils/libiberty/config/mt-mingw32
rename to x/binutils/libiberty/config/mt-mingw32
diff --git a/contrib/binutils/libiberty/configure b/x/binutils/libiberty/configure
similarity index 100%
rename from contrib/binutils/libiberty/configure
rename to x/binutils/libiberty/configure
diff --git a/contrib/binutils/libiberty/configure.in b/x/binutils/libiberty/configure.in
similarity index 100%
rename from contrib/binutils/libiberty/configure.in
rename to x/binutils/libiberty/configure.in
diff --git a/contrib/binutils/libiberty/copying-lib.texi b/x/binutils/libiberty/copying-lib.texi
similarity index 100%
rename from contrib/binutils/libiberty/copying-lib.texi
rename to x/binutils/libiberty/copying-lib.texi
diff --git a/contrib/binutils/libiberty/copysign.c b/x/binutils/libiberty/copysign.c
similarity index 100%
rename from contrib/binutils/libiberty/copysign.c
rename to x/binutils/libiberty/copysign.c
diff --git a/contrib/binutils/libiberty/cp-demangle.c b/x/binutils/libiberty/cp-demangle.c
similarity index 100%
rename from contrib/binutils/libiberty/cp-demangle.c
rename to x/binutils/libiberty/cp-demangle.c
diff --git a/contrib/binutils/libiberty/cp-demangle.h b/x/binutils/libiberty/cp-demangle.h
similarity index 100%
rename from contrib/binutils/libiberty/cp-demangle.h
rename to x/binutils/libiberty/cp-demangle.h
diff --git a/contrib/binutils/libiberty/cp-demint.c b/x/binutils/libiberty/cp-demint.c
similarity index 100%
rename from contrib/binutils/libiberty/cp-demint.c
rename to x/binutils/libiberty/cp-demint.c
diff --git a/contrib/binutils/libiberty/cplus-dem.c b/x/binutils/libiberty/cplus-dem.c
similarity index 100%
rename from contrib/binutils/libiberty/cplus-dem.c
rename to x/binutils/libiberty/cplus-dem.c
diff --git a/contrib/binutils/libiberty/dummy.c b/x/binutils/libiberty/dummy.c
similarity index 100%
rename from contrib/binutils/libiberty/dummy.c
rename to x/binutils/libiberty/dummy.c
diff --git a/contrib/binutils/libiberty/dyn-string.c b/x/binutils/libiberty/dyn-string.c
similarity index 100%
rename from contrib/binutils/libiberty/dyn-string.c
rename to x/binutils/libiberty/dyn-string.c
diff --git a/contrib/binutils/libiberty/fdmatch.c b/x/binutils/libiberty/fdmatch.c
similarity index 100%
rename from contrib/binutils/libiberty/fdmatch.c
rename to x/binutils/libiberty/fdmatch.c
diff --git a/contrib/binutils/libiberty/ffs.c b/x/binutils/libiberty/ffs.c
similarity index 100%
rename from contrib/binutils/libiberty/ffs.c
rename to x/binutils/libiberty/ffs.c
diff --git a/contrib/binutils/libiberty/fibheap.c b/x/binutils/libiberty/fibheap.c
similarity index 100%
rename from contrib/binutils/libiberty/fibheap.c
rename to x/binutils/libiberty/fibheap.c
diff --git a/contrib/binutils/libiberty/floatformat.c b/x/binutils/libiberty/floatformat.c
similarity index 100%
rename from contrib/binutils/libiberty/floatformat.c
rename to x/binutils/libiberty/floatformat.c
diff --git a/contrib/binutils/libiberty/fnmatch.c b/x/binutils/libiberty/fnmatch.c
similarity index 100%
rename from contrib/binutils/libiberty/fnmatch.c
rename to x/binutils/libiberty/fnmatch.c
diff --git a/contrib/binutils/libiberty/fnmatch.txh b/x/binutils/libiberty/fnmatch.txh
similarity index 100%
rename from contrib/binutils/libiberty/fnmatch.txh
rename to x/binutils/libiberty/fnmatch.txh
diff --git a/contrib/binutils/libiberty/functions.def b/x/binutils/libiberty/functions.def
similarity index 100%
rename from contrib/binutils/libiberty/functions.def
rename to x/binutils/libiberty/functions.def
diff --git a/contrib/binutils/libiberty/functions.texi b/x/binutils/libiberty/functions.texi
similarity index 100%
rename from contrib/binutils/libiberty/functions.texi
rename to x/binutils/libiberty/functions.texi
diff --git a/contrib/binutils/libiberty/gather-docs b/x/binutils/libiberty/gather-docs
similarity index 100%
rename from contrib/binutils/libiberty/gather-docs
rename to x/binutils/libiberty/gather-docs
diff --git a/contrib/binutils/libiberty/getcwd.c b/x/binutils/libiberty/getcwd.c
similarity index 100%
rename from contrib/binutils/libiberty/getcwd.c
rename to x/binutils/libiberty/getcwd.c
diff --git a/contrib/binutils/libiberty/getopt.c b/x/binutils/libiberty/getopt.c
similarity index 100%
rename from contrib/binutils/libiberty/getopt.c
rename to x/binutils/libiberty/getopt.c
diff --git a/contrib/binutils/libiberty/getopt1.c b/x/binutils/libiberty/getopt1.c
similarity index 100%
rename from contrib/binutils/libiberty/getopt1.c
rename to x/binutils/libiberty/getopt1.c
diff --git a/contrib/binutils/libiberty/getpagesize.c b/x/binutils/libiberty/getpagesize.c
similarity index 100%
rename from contrib/binutils/libiberty/getpagesize.c
rename to x/binutils/libiberty/getpagesize.c
diff --git a/contrib/binutils/libiberty/getpwd.c b/x/binutils/libiberty/getpwd.c
similarity index 100%
rename from contrib/binutils/libiberty/getpwd.c
rename to x/binutils/libiberty/getpwd.c
diff --git a/contrib/binutils/libiberty/getruntime.c b/x/binutils/libiberty/getruntime.c
similarity index 100%
rename from contrib/binutils/libiberty/getruntime.c
rename to x/binutils/libiberty/getruntime.c
diff --git a/contrib/binutils/libiberty/hashtab.c b/x/binutils/libiberty/hashtab.c
similarity index 100%
rename from contrib/binutils/libiberty/hashtab.c
rename to x/binutils/libiberty/hashtab.c
diff --git a/contrib/binutils/libiberty/hex.c b/x/binutils/libiberty/hex.c
similarity index 100%
rename from contrib/binutils/libiberty/hex.c
rename to x/binutils/libiberty/hex.c
diff --git a/contrib/binutils/libiberty/index.c b/x/binutils/libiberty/index.c
similarity index 100%
rename from contrib/binutils/libiberty/index.c
rename to x/binutils/libiberty/index.c
diff --git a/contrib/binutils/libiberty/insque.c b/x/binutils/libiberty/insque.c
similarity index 100%
rename from contrib/binutils/libiberty/insque.c
rename to x/binutils/libiberty/insque.c
diff --git a/contrib/binutils/libiberty/lbasename.c b/x/binutils/libiberty/lbasename.c
similarity index 100%
rename from contrib/binutils/libiberty/lbasename.c
rename to x/binutils/libiberty/lbasename.c
diff --git a/contrib/binutils/libiberty/libiberty.texi b/x/binutils/libiberty/libiberty.texi
similarity index 100%
rename from contrib/binutils/libiberty/libiberty.texi
rename to x/binutils/libiberty/libiberty.texi
diff --git a/contrib/binutils/libiberty/lrealpath.c b/x/binutils/libiberty/lrealpath.c
similarity index 100%
rename from contrib/binutils/libiberty/lrealpath.c
rename to x/binutils/libiberty/lrealpath.c
diff --git a/contrib/binutils/libiberty/maint-tool b/x/binutils/libiberty/maint-tool
similarity index 100%
rename from contrib/binutils/libiberty/maint-tool
rename to x/binutils/libiberty/maint-tool
diff --git a/contrib/binutils/libiberty/make-relative-prefix.c b/x/binutils/libiberty/make-relative-prefix.c
similarity index 100%
rename from contrib/binutils/libiberty/make-relative-prefix.c
rename to x/binutils/libiberty/make-relative-prefix.c
diff --git a/contrib/binutils/libiberty/make-temp-file.c b/x/binutils/libiberty/make-temp-file.c
similarity index 100%
rename from contrib/binutils/libiberty/make-temp-file.c
rename to x/binutils/libiberty/make-temp-file.c
diff --git a/contrib/binutils/libiberty/md5.c b/x/binutils/libiberty/md5.c
similarity index 100%
rename from contrib/binutils/libiberty/md5.c
rename to x/binutils/libiberty/md5.c
diff --git a/contrib/binutils/libiberty/memchr.c b/x/binutils/libiberty/memchr.c
similarity index 100%
rename from contrib/binutils/libiberty/memchr.c
rename to x/binutils/libiberty/memchr.c
diff --git a/contrib/binutils/libiberty/memcmp.c b/x/binutils/libiberty/memcmp.c
similarity index 100%
rename from contrib/binutils/libiberty/memcmp.c
rename to x/binutils/libiberty/memcmp.c
diff --git a/contrib/binutils/libiberty/memcpy.c b/x/binutils/libiberty/memcpy.c
similarity index 100%
rename from contrib/binutils/libiberty/memcpy.c
rename to x/binutils/libiberty/memcpy.c
diff --git a/contrib/binutils/libiberty/memmove.c b/x/binutils/libiberty/memmove.c
similarity index 100%
rename from contrib/binutils/libiberty/memmove.c
rename to x/binutils/libiberty/memmove.c
diff --git a/contrib/binutils/libiberty/memset.c b/x/binutils/libiberty/memset.c
similarity index 100%
rename from contrib/binutils/libiberty/memset.c
rename to x/binutils/libiberty/memset.c
diff --git a/contrib/binutils/libiberty/mkstemps.c b/x/binutils/libiberty/mkstemps.c
similarity index 100%
rename from contrib/binutils/libiberty/mkstemps.c
rename to x/binutils/libiberty/mkstemps.c
diff --git a/contrib/binutils/libiberty/objalloc.c b/x/binutils/libiberty/objalloc.c
similarity index 100%
rename from contrib/binutils/libiberty/objalloc.c
rename to x/binutils/libiberty/objalloc.c
diff --git a/contrib/binutils/libiberty/obstack.c b/x/binutils/libiberty/obstack.c
similarity index 100%
rename from contrib/binutils/libiberty/obstack.c
rename to x/binutils/libiberty/obstack.c
diff --git a/contrib/binutils/libiberty/obstacks.texi b/x/binutils/libiberty/obstacks.texi
similarity index 100%
rename from contrib/binutils/libiberty/obstacks.texi
rename to x/binutils/libiberty/obstacks.texi
diff --git a/contrib/binutils/libiberty/partition.c b/x/binutils/libiberty/partition.c
similarity index 100%
rename from contrib/binutils/libiberty/partition.c
rename to x/binutils/libiberty/partition.c
diff --git a/contrib/binutils/libiberty/pexecute.c b/x/binutils/libiberty/pexecute.c
similarity index 100%
rename from contrib/binutils/libiberty/pexecute.c
rename to x/binutils/libiberty/pexecute.c
diff --git a/contrib/binutils/libiberty/physmem.c b/x/binutils/libiberty/physmem.c
similarity index 100%
rename from contrib/binutils/libiberty/physmem.c
rename to x/binutils/libiberty/physmem.c
diff --git a/contrib/binutils/libiberty/putenv.c b/x/binutils/libiberty/putenv.c
similarity index 100%
rename from contrib/binutils/libiberty/putenv.c
rename to x/binutils/libiberty/putenv.c
diff --git a/contrib/binutils/libiberty/random.c b/x/binutils/libiberty/random.c
similarity index 100%
rename from contrib/binutils/libiberty/random.c
rename to x/binutils/libiberty/random.c
diff --git a/contrib/binutils/libiberty/regex.c b/x/binutils/libiberty/regex.c
similarity index 100%
rename from contrib/binutils/libiberty/regex.c
rename to x/binutils/libiberty/regex.c
diff --git a/contrib/binutils/libiberty/rename.c b/x/binutils/libiberty/rename.c
similarity index 100%
rename from contrib/binutils/libiberty/rename.c
rename to x/binutils/libiberty/rename.c
diff --git a/contrib/binutils/libiberty/rindex.c b/x/binutils/libiberty/rindex.c
similarity index 100%
rename from contrib/binutils/libiberty/rindex.c
rename to x/binutils/libiberty/rindex.c
diff --git a/contrib/binutils/libiberty/safe-ctype.c b/x/binutils/libiberty/safe-ctype.c
similarity index 100%
rename from contrib/binutils/libiberty/safe-ctype.c
rename to x/binutils/libiberty/safe-ctype.c
diff --git a/contrib/binutils/libiberty/setenv.c b/x/binutils/libiberty/setenv.c
similarity index 100%
rename from contrib/binutils/libiberty/setenv.c
rename to x/binutils/libiberty/setenv.c
diff --git a/contrib/binutils/libiberty/sigsetmask.c b/x/binutils/libiberty/sigsetmask.c
similarity index 100%
rename from contrib/binutils/libiberty/sigsetmask.c
rename to x/binutils/libiberty/sigsetmask.c
diff --git a/contrib/binutils/libiberty/sort.c b/x/binutils/libiberty/sort.c
similarity index 100%
rename from contrib/binutils/libiberty/sort.c
rename to x/binutils/libiberty/sort.c
diff --git a/contrib/binutils/libiberty/spaces.c b/x/binutils/libiberty/spaces.c
similarity index 100%
rename from contrib/binutils/libiberty/spaces.c
rename to x/binutils/libiberty/spaces.c
diff --git a/contrib/binutils/libiberty/splay-tree.c b/x/binutils/libiberty/splay-tree.c
similarity index 100%
rename from contrib/binutils/libiberty/splay-tree.c
rename to x/binutils/libiberty/splay-tree.c
diff --git a/contrib/binutils/libiberty/strcasecmp.c b/x/binutils/libiberty/strcasecmp.c
similarity index 100%
rename from contrib/binutils/libiberty/strcasecmp.c
rename to x/binutils/libiberty/strcasecmp.c
diff --git a/contrib/binutils/libiberty/strchr.c b/x/binutils/libiberty/strchr.c
similarity index 100%
rename from contrib/binutils/libiberty/strchr.c
rename to x/binutils/libiberty/strchr.c
diff --git a/contrib/binutils/libiberty/strdup.c b/x/binutils/libiberty/strdup.c
similarity index 100%
rename from contrib/binutils/libiberty/strdup.c
rename to x/binutils/libiberty/strdup.c
diff --git a/contrib/binutils/libiberty/strerror.c b/x/binutils/libiberty/strerror.c
similarity index 100%
rename from contrib/binutils/libiberty/strerror.c
rename to x/binutils/libiberty/strerror.c
diff --git a/contrib/binutils/libiberty/strncasecmp.c b/x/binutils/libiberty/strncasecmp.c
similarity index 100%
rename from contrib/binutils/libiberty/strncasecmp.c
rename to x/binutils/libiberty/strncasecmp.c
diff --git a/contrib/binutils/libiberty/strncmp.c b/x/binutils/libiberty/strncmp.c
similarity index 100%
rename from contrib/binutils/libiberty/strncmp.c
rename to x/binutils/libiberty/strncmp.c
diff --git a/contrib/binutils/libiberty/strrchr.c b/x/binutils/libiberty/strrchr.c
similarity index 100%
rename from contrib/binutils/libiberty/strrchr.c
rename to x/binutils/libiberty/strrchr.c
diff --git a/contrib/binutils/libiberty/strsignal.c b/x/binutils/libiberty/strsignal.c
similarity index 100%
rename from contrib/binutils/libiberty/strsignal.c
rename to x/binutils/libiberty/strsignal.c
diff --git a/contrib/binutils/libiberty/strstr.c b/x/binutils/libiberty/strstr.c
similarity index 100%
rename from contrib/binutils/libiberty/strstr.c
rename to x/binutils/libiberty/strstr.c
diff --git a/contrib/binutils/libiberty/strtod.c b/x/binutils/libiberty/strtod.c
similarity index 100%
rename from contrib/binutils/libiberty/strtod.c
rename to x/binutils/libiberty/strtod.c
diff --git a/contrib/binutils/libiberty/strtol.c b/x/binutils/libiberty/strtol.c
similarity index 100%
rename from contrib/binutils/libiberty/strtol.c
rename to x/binutils/libiberty/strtol.c
diff --git a/contrib/binutils/libiberty/strtoul.c b/x/binutils/libiberty/strtoul.c
similarity index 100%
rename from contrib/binutils/libiberty/strtoul.c
rename to x/binutils/libiberty/strtoul.c
diff --git a/contrib/binutils/libiberty/ternary.c b/x/binutils/libiberty/ternary.c
similarity index 100%
rename from contrib/binutils/libiberty/ternary.c
rename to x/binutils/libiberty/ternary.c
diff --git a/contrib/binutils/libiberty/tmpnam.c b/x/binutils/libiberty/tmpnam.c
similarity index 100%
rename from contrib/binutils/libiberty/tmpnam.c
rename to x/binutils/libiberty/tmpnam.c
diff --git a/contrib/binutils/libiberty/vasprintf.c b/x/binutils/libiberty/vasprintf.c
similarity index 100%
rename from contrib/binutils/libiberty/vasprintf.c
rename to x/binutils/libiberty/vasprintf.c
diff --git a/contrib/binutils/libiberty/vfork.c b/x/binutils/libiberty/vfork.c
similarity index 100%
rename from contrib/binutils/libiberty/vfork.c
rename to x/binutils/libiberty/vfork.c
diff --git a/contrib/binutils/libiberty/vfprintf.c b/x/binutils/libiberty/vfprintf.c
similarity index 100%
rename from contrib/binutils/libiberty/vfprintf.c
rename to x/binutils/libiberty/vfprintf.c
diff --git a/contrib/binutils/libiberty/vprintf.c b/x/binutils/libiberty/vprintf.c
similarity index 100%
rename from contrib/binutils/libiberty/vprintf.c
rename to x/binutils/libiberty/vprintf.c
diff --git a/contrib/binutils/libiberty/vsprintf.c b/x/binutils/libiberty/vsprintf.c
similarity index 100%
rename from contrib/binutils/libiberty/vsprintf.c
rename to x/binutils/libiberty/vsprintf.c
diff --git a/contrib/binutils/libiberty/waitpid.c b/x/binutils/libiberty/waitpid.c
similarity index 100%
rename from contrib/binutils/libiberty/waitpid.c
rename to x/binutils/libiberty/waitpid.c
diff --git a/contrib/binutils/libiberty/xatexit.c b/x/binutils/libiberty/xatexit.c
similarity index 100%
rename from contrib/binutils/libiberty/xatexit.c
rename to x/binutils/libiberty/xatexit.c
diff --git a/contrib/binutils/libiberty/xexit.c b/x/binutils/libiberty/xexit.c
similarity index 100%
rename from contrib/binutils/libiberty/xexit.c
rename to x/binutils/libiberty/xexit.c
diff --git a/contrib/binutils/libiberty/xmalloc.c b/x/binutils/libiberty/xmalloc.c
similarity index 100%
rename from contrib/binutils/libiberty/xmalloc.c
rename to x/binutils/libiberty/xmalloc.c
diff --git a/contrib/binutils/libiberty/xmemdup.c b/x/binutils/libiberty/xmemdup.c
similarity index 100%
rename from contrib/binutils/libiberty/xmemdup.c
rename to x/binutils/libiberty/xmemdup.c
diff --git a/contrib/binutils/libiberty/xstrdup.c b/x/binutils/libiberty/xstrdup.c
similarity index 100%
rename from contrib/binutils/libiberty/xstrdup.c
rename to x/binutils/libiberty/xstrdup.c
diff --git a/contrib/binutils/libiberty/xstrerror.c b/x/binutils/libiberty/xstrerror.c
similarity index 100%
rename from contrib/binutils/libiberty/xstrerror.c
rename to x/binutils/libiberty/xstrerror.c
diff --git a/contrib/binutils/libtool.m4 b/x/binutils/libtool.m4
similarity index 100%
rename from contrib/binutils/libtool.m4
rename to x/binutils/libtool.m4
diff --git a/contrib/binutils/ltcf-c.sh b/x/binutils/ltcf-c.sh
similarity index 100%
rename from contrib/binutils/ltcf-c.sh
rename to x/binutils/ltcf-c.sh
diff --git a/contrib/binutils/ltcf-cxx.sh b/x/binutils/ltcf-cxx.sh
similarity index 100%
rename from contrib/binutils/ltcf-cxx.sh
rename to x/binutils/ltcf-cxx.sh
diff --git a/contrib/binutils/ltcf-gcj.sh b/x/binutils/ltcf-gcj.sh
similarity index 100%
rename from contrib/binutils/ltcf-gcj.sh
rename to x/binutils/ltcf-gcj.sh
diff --git a/contrib/binutils/ltconfig b/x/binutils/ltconfig
similarity index 100%
rename from contrib/binutils/ltconfig
rename to x/binutils/ltconfig
diff --git a/contrib/binutils/ltmain.sh b/x/binutils/ltmain.sh
similarity index 100%
rename from contrib/binutils/ltmain.sh
rename to x/binutils/ltmain.sh
diff --git a/contrib/binutils/md5.sum b/x/binutils/md5.sum
similarity index 100%
rename from contrib/binutils/md5.sum
rename to x/binutils/md5.sum
diff --git a/contrib/binutils/missing b/x/binutils/missing
similarity index 100%
rename from contrib/binutils/missing
rename to x/binutils/missing
diff --git a/contrib/binutils/mkinstalldirs b/x/binutils/mkinstalldirs
similarity index 100%
rename from contrib/binutils/mkinstalldirs
rename to x/binutils/mkinstalldirs
diff --git a/contrib/binutils/move-if-change b/x/binutils/move-if-change
similarity index 100%
rename from contrib/binutils/move-if-change
rename to x/binutils/move-if-change
diff --git a/contrib/binutils/opcodes/ChangeLog b/x/binutils/opcodes/ChangeLog
similarity index 100%
rename from contrib/binutils/opcodes/ChangeLog
rename to x/binutils/opcodes/ChangeLog
diff --git a/contrib/binutils/opcodes/ChangeLog-0001 b/x/binutils/opcodes/ChangeLog-0001
similarity index 100%
rename from contrib/binutils/opcodes/ChangeLog-0001
rename to x/binutils/opcodes/ChangeLog-0001
diff --git a/contrib/binutils/opcodes/ChangeLog-0203 b/x/binutils/opcodes/ChangeLog-0203
similarity index 100%
rename from contrib/binutils/opcodes/ChangeLog-0203
rename to x/binutils/opcodes/ChangeLog-0203
diff --git a/contrib/binutils/opcodes/ChangeLog-9297 b/x/binutils/opcodes/ChangeLog-9297
similarity index 100%
rename from contrib/binutils/opcodes/ChangeLog-9297
rename to x/binutils/opcodes/ChangeLog-9297
diff --git a/contrib/binutils/opcodes/ChangeLog-9899 b/x/binutils/opcodes/ChangeLog-9899
similarity index 100%
rename from contrib/binutils/opcodes/ChangeLog-9899
rename to x/binutils/opcodes/ChangeLog-9899
diff --git a/contrib/binutils/opcodes/MAINTAINERS b/x/binutils/opcodes/MAINTAINERS
similarity index 100%
rename from contrib/binutils/opcodes/MAINTAINERS
rename to x/binutils/opcodes/MAINTAINERS
diff --git a/contrib/binutils/opcodes/Makefile.am b/x/binutils/opcodes/Makefile.am
similarity index 100%
rename from contrib/binutils/opcodes/Makefile.am
rename to x/binutils/opcodes/Makefile.am
diff --git a/contrib/binutils/opcodes/Makefile.in b/x/binutils/opcodes/Makefile.in
similarity index 100%
rename from contrib/binutils/opcodes/Makefile.in
rename to x/binutils/opcodes/Makefile.in
diff --git a/contrib/binutils/opcodes/acconfig.h b/x/binutils/opcodes/acconfig.h
similarity index 100%
rename from contrib/binutils/opcodes/acconfig.h
rename to x/binutils/opcodes/acconfig.h
diff --git a/contrib/binutils/opcodes/acinclude.m4 b/x/binutils/opcodes/acinclude.m4
similarity index 100%
rename from contrib/binutils/opcodes/acinclude.m4
rename to x/binutils/opcodes/acinclude.m4
diff --git a/contrib/binutils/opcodes/aclocal.m4 b/x/binutils/opcodes/aclocal.m4
similarity index 100%
rename from contrib/binutils/opcodes/aclocal.m4
rename to x/binutils/opcodes/aclocal.m4
diff --git a/contrib/binutils/opcodes/alpha-dis.c b/x/binutils/opcodes/alpha-dis.c
similarity index 100%
rename from contrib/binutils/opcodes/alpha-dis.c
rename to x/binutils/opcodes/alpha-dis.c
diff --git a/contrib/binutils/opcodes/alpha-opc.c b/x/binutils/opcodes/alpha-opc.c
similarity index 100%
rename from contrib/binutils/opcodes/alpha-opc.c
rename to x/binutils/opcodes/alpha-opc.c
diff --git a/contrib/binutils/opcodes/arc-dis.c b/x/binutils/opcodes/arc-dis.c
similarity index 100%
rename from contrib/binutils/opcodes/arc-dis.c
rename to x/binutils/opcodes/arc-dis.c
diff --git a/contrib/binutils/opcodes/arc-dis.h b/x/binutils/opcodes/arc-dis.h
similarity index 100%
rename from contrib/binutils/opcodes/arc-dis.h
rename to x/binutils/opcodes/arc-dis.h
diff --git a/contrib/binutils/opcodes/arc-ext.c b/x/binutils/opcodes/arc-ext.c
similarity index 100%
rename from contrib/binutils/opcodes/arc-ext.c
rename to x/binutils/opcodes/arc-ext.c
diff --git a/contrib/binutils/opcodes/arc-ext.h b/x/binutils/opcodes/arc-ext.h
similarity index 100%
rename from contrib/binutils/opcodes/arc-ext.h
rename to x/binutils/opcodes/arc-ext.h
diff --git a/contrib/binutils/opcodes/arc-opc.c b/x/binutils/opcodes/arc-opc.c
similarity index 100%
rename from contrib/binutils/opcodes/arc-opc.c
rename to x/binutils/opcodes/arc-opc.c
diff --git a/contrib/binutils/opcodes/arm-dis.c b/x/binutils/opcodes/arm-dis.c
similarity index 100%
rename from contrib/binutils/opcodes/arm-dis.c
rename to x/binutils/opcodes/arm-dis.c
diff --git a/contrib/binutils/opcodes/arm-opc.h b/x/binutils/opcodes/arm-opc.h
similarity index 100%
rename from contrib/binutils/opcodes/arm-opc.h
rename to x/binutils/opcodes/arm-opc.h
diff --git a/contrib/binutils/opcodes/cgen-asm.c b/x/binutils/opcodes/cgen-asm.c
similarity index 100%
rename from contrib/binutils/opcodes/cgen-asm.c
rename to x/binutils/opcodes/cgen-asm.c
diff --git a/contrib/binutils/opcodes/cgen-asm.in b/x/binutils/opcodes/cgen-asm.in
similarity index 100%
rename from contrib/binutils/opcodes/cgen-asm.in
rename to x/binutils/opcodes/cgen-asm.in
diff --git a/contrib/binutils/opcodes/cgen-dis.c b/x/binutils/opcodes/cgen-dis.c
similarity index 100%
rename from contrib/binutils/opcodes/cgen-dis.c
rename to x/binutils/opcodes/cgen-dis.c
diff --git a/contrib/binutils/opcodes/cgen-dis.in b/x/binutils/opcodes/cgen-dis.in
similarity index 100%
rename from contrib/binutils/opcodes/cgen-dis.in
rename to x/binutils/opcodes/cgen-dis.in
diff --git a/contrib/binutils/opcodes/cgen-ibld.in b/x/binutils/opcodes/cgen-ibld.in
similarity index 100%
rename from contrib/binutils/opcodes/cgen-ibld.in
rename to x/binutils/opcodes/cgen-ibld.in
diff --git a/contrib/binutils/opcodes/cgen-opc.c b/x/binutils/opcodes/cgen-opc.c
similarity index 100%
rename from contrib/binutils/opcodes/cgen-opc.c
rename to x/binutils/opcodes/cgen-opc.c
diff --git a/contrib/binutils/opcodes/cgen.sh b/x/binutils/opcodes/cgen.sh
similarity index 100%
rename from contrib/binutils/opcodes/cgen.sh
rename to x/binutils/opcodes/cgen.sh
diff --git a/contrib/binutils/opcodes/config.in b/x/binutils/opcodes/config.in
similarity index 100%
rename from contrib/binutils/opcodes/config.in
rename to x/binutils/opcodes/config.in
diff --git a/contrib/binutils/opcodes/configure b/x/binutils/opcodes/configure
similarity index 100%
rename from contrib/binutils/opcodes/configure
rename to x/binutils/opcodes/configure
diff --git a/contrib/binutils/opcodes/configure.in b/x/binutils/opcodes/configure.in
similarity index 100%
rename from contrib/binutils/opcodes/configure.in
rename to x/binutils/opcodes/configure.in
diff --git a/contrib/binutils/opcodes/dep-in.sed b/x/binutils/opcodes/dep-in.sed
similarity index 100%
rename from contrib/binutils/opcodes/dep-in.sed
rename to x/binutils/opcodes/dep-in.sed
diff --git a/contrib/binutils/opcodes/dis-buf.c b/x/binutils/opcodes/dis-buf.c
similarity index 100%
rename from contrib/binutils/opcodes/dis-buf.c
rename to x/binutils/opcodes/dis-buf.c
diff --git a/contrib/binutils/opcodes/dis-init.c b/x/binutils/opcodes/dis-init.c
similarity index 100%
rename from contrib/binutils/opcodes/dis-init.c
rename to x/binutils/opcodes/dis-init.c
diff --git a/contrib/binutils/opcodes/disassemble.c b/x/binutils/opcodes/disassemble.c
similarity index 100%
rename from contrib/binutils/opcodes/disassemble.c
rename to x/binutils/opcodes/disassemble.c
diff --git a/contrib/binutils/opcodes/i386-dis.c b/x/binutils/opcodes/i386-dis.c
similarity index 100%
rename from contrib/binutils/opcodes/i386-dis.c
rename to x/binutils/opcodes/i386-dis.c
diff --git a/contrib/binutils/opcodes/ia64-asmtab.c b/x/binutils/opcodes/ia64-asmtab.c
similarity index 100%
rename from contrib/binutils/opcodes/ia64-asmtab.c
rename to x/binutils/opcodes/ia64-asmtab.c
diff --git a/contrib/binutils/opcodes/ia64-asmtab.h b/x/binutils/opcodes/ia64-asmtab.h
similarity index 100%
rename from contrib/binutils/opcodes/ia64-asmtab.h
rename to x/binutils/opcodes/ia64-asmtab.h
diff --git a/contrib/binutils/opcodes/ia64-dis.c b/x/binutils/opcodes/ia64-dis.c
similarity index 100%
rename from contrib/binutils/opcodes/ia64-dis.c
rename to x/binutils/opcodes/ia64-dis.c
diff --git a/contrib/binutils/opcodes/ia64-gen.c b/x/binutils/opcodes/ia64-gen.c
similarity index 100%
rename from contrib/binutils/opcodes/ia64-gen.c
rename to x/binutils/opcodes/ia64-gen.c
diff --git a/contrib/binutils/opcodes/ia64-ic.tbl b/x/binutils/opcodes/ia64-ic.tbl
similarity index 100%
rename from contrib/binutils/opcodes/ia64-ic.tbl
rename to x/binutils/opcodes/ia64-ic.tbl
diff --git a/contrib/binutils/opcodes/ia64-opc-a.c b/x/binutils/opcodes/ia64-opc-a.c
similarity index 100%
rename from contrib/binutils/opcodes/ia64-opc-a.c
rename to x/binutils/opcodes/ia64-opc-a.c
diff --git a/contrib/binutils/opcodes/ia64-opc-b.c b/x/binutils/opcodes/ia64-opc-b.c
similarity index 100%
rename from contrib/binutils/opcodes/ia64-opc-b.c
rename to x/binutils/opcodes/ia64-opc-b.c
diff --git a/contrib/binutils/opcodes/ia64-opc-d.c b/x/binutils/opcodes/ia64-opc-d.c
similarity index 100%
rename from contrib/binutils/opcodes/ia64-opc-d.c
rename to x/binutils/opcodes/ia64-opc-d.c
diff --git a/contrib/binutils/opcodes/ia64-opc-f.c b/x/binutils/opcodes/ia64-opc-f.c
similarity index 100%
rename from contrib/binutils/opcodes/ia64-opc-f.c
rename to x/binutils/opcodes/ia64-opc-f.c
diff --git a/contrib/binutils/opcodes/ia64-opc-i.c b/x/binutils/opcodes/ia64-opc-i.c
similarity index 100%
rename from contrib/binutils/opcodes/ia64-opc-i.c
rename to x/binutils/opcodes/ia64-opc-i.c
diff --git a/contrib/binutils/opcodes/ia64-opc-m.c b/x/binutils/opcodes/ia64-opc-m.c
similarity index 100%
rename from contrib/binutils/opcodes/ia64-opc-m.c
rename to x/binutils/opcodes/ia64-opc-m.c
diff --git a/contrib/binutils/opcodes/ia64-opc-x.c b/x/binutils/opcodes/ia64-opc-x.c
similarity index 100%
rename from contrib/binutils/opcodes/ia64-opc-x.c
rename to x/binutils/opcodes/ia64-opc-x.c
diff --git a/contrib/binutils/opcodes/ia64-opc.c b/x/binutils/opcodes/ia64-opc.c
similarity index 100%
rename from contrib/binutils/opcodes/ia64-opc.c
rename to x/binutils/opcodes/ia64-opc.c
diff --git a/contrib/binutils/opcodes/ia64-opc.h b/x/binutils/opcodes/ia64-opc.h
similarity index 100%
rename from contrib/binutils/opcodes/ia64-opc.h
rename to x/binutils/opcodes/ia64-opc.h
diff --git a/contrib/binutils/opcodes/ia64-raw.tbl b/x/binutils/opcodes/ia64-raw.tbl
similarity index 100%
rename from contrib/binutils/opcodes/ia64-raw.tbl
rename to x/binutils/opcodes/ia64-raw.tbl
diff --git a/contrib/binutils/opcodes/ia64-war.tbl b/x/binutils/opcodes/ia64-war.tbl
similarity index 100%
rename from contrib/binutils/opcodes/ia64-war.tbl
rename to x/binutils/opcodes/ia64-war.tbl
diff --git a/contrib/binutils/opcodes/ia64-waw.tbl b/x/binutils/opcodes/ia64-waw.tbl
similarity index 100%
rename from contrib/binutils/opcodes/ia64-waw.tbl
rename to x/binutils/opcodes/ia64-waw.tbl
diff --git a/contrib/binutils/opcodes/mips-dis.c b/x/binutils/opcodes/mips-dis.c
similarity index 100%
rename from contrib/binutils/opcodes/mips-dis.c
rename to x/binutils/opcodes/mips-dis.c
diff --git a/contrib/binutils/opcodes/mips-opc.c b/x/binutils/opcodes/mips-opc.c
similarity index 100%
rename from contrib/binutils/opcodes/mips-opc.c
rename to x/binutils/opcodes/mips-opc.c
diff --git a/contrib/binutils/opcodes/mips16-opc.c b/x/binutils/opcodes/mips16-opc.c
similarity index 100%
rename from contrib/binutils/opcodes/mips16-opc.c
rename to x/binutils/opcodes/mips16-opc.c
diff --git a/contrib/binutils/opcodes/opintl.h b/x/binutils/opcodes/opintl.h
similarity index 100%
rename from contrib/binutils/opcodes/opintl.h
rename to x/binutils/opcodes/opintl.h
diff --git a/contrib/binutils/opcodes/po/Make-in b/x/binutils/opcodes/po/Make-in
similarity index 100%
rename from contrib/binutils/opcodes/po/Make-in
rename to x/binutils/opcodes/po/Make-in
diff --git a/contrib/binutils/opcodes/po/POTFILES.in b/x/binutils/opcodes/po/POTFILES.in
similarity index 100%
rename from contrib/binutils/opcodes/po/POTFILES.in
rename to x/binutils/opcodes/po/POTFILES.in
diff --git a/contrib/binutils/opcodes/po/opcodes.pot b/x/binutils/opcodes/po/opcodes.pot
similarity index 100%
rename from contrib/binutils/opcodes/po/opcodes.pot
rename to x/binutils/opcodes/po/opcodes.pot
diff --git a/contrib/binutils/opcodes/ppc-dis.c b/x/binutils/opcodes/ppc-dis.c
similarity index 100%
rename from contrib/binutils/opcodes/ppc-dis.c
rename to x/binutils/opcodes/ppc-dis.c
diff --git a/contrib/binutils/opcodes/ppc-opc.c b/x/binutils/opcodes/ppc-opc.c
similarity index 100%
rename from contrib/binutils/opcodes/ppc-opc.c
rename to x/binutils/opcodes/ppc-opc.c
diff --git a/contrib/binutils/opcodes/s390-dis.c b/x/binutils/opcodes/s390-dis.c
similarity index 100%
rename from contrib/binutils/opcodes/s390-dis.c
rename to x/binutils/opcodes/s390-dis.c
diff --git a/contrib/binutils/opcodes/s390-mkopc.c b/x/binutils/opcodes/s390-mkopc.c
similarity index 100%
rename from contrib/binutils/opcodes/s390-mkopc.c
rename to x/binutils/opcodes/s390-mkopc.c
diff --git a/contrib/binutils/opcodes/s390-opc.c b/x/binutils/opcodes/s390-opc.c
similarity index 100%
rename from contrib/binutils/opcodes/s390-opc.c
rename to x/binutils/opcodes/s390-opc.c
diff --git a/contrib/binutils/opcodes/s390-opc.txt b/x/binutils/opcodes/s390-opc.txt
similarity index 100%
rename from contrib/binutils/opcodes/s390-opc.txt
rename to x/binutils/opcodes/s390-opc.txt
diff --git a/contrib/binutils/opcodes/sh-dis.c b/x/binutils/opcodes/sh-dis.c
similarity index 100%
rename from contrib/binutils/opcodes/sh-dis.c
rename to x/binutils/opcodes/sh-dis.c
diff --git a/contrib/binutils/opcodes/sh-opc.h b/x/binutils/opcodes/sh-opc.h
similarity index 100%
rename from contrib/binutils/opcodes/sh-opc.h
rename to x/binutils/opcodes/sh-opc.h
diff --git a/contrib/binutils/opcodes/sparc-dis.c b/x/binutils/opcodes/sparc-dis.c
similarity index 100%
rename from contrib/binutils/opcodes/sparc-dis.c
rename to x/binutils/opcodes/sparc-dis.c
diff --git a/contrib/binutils/opcodes/sparc-opc.c b/x/binutils/opcodes/sparc-opc.c
similarity index 100%
rename from contrib/binutils/opcodes/sparc-opc.c
rename to x/binutils/opcodes/sparc-opc.c
diff --git a/contrib/binutils/opcodes/stamp-h.in b/x/binutils/opcodes/stamp-h.in
similarity index 100%
rename from contrib/binutils/opcodes/stamp-h.in
rename to x/binutils/opcodes/stamp-h.in
diff --git a/contrib/binutils/opcodes/sysdep.h b/x/binutils/opcodes/sysdep.h
similarity index 100%
rename from contrib/binutils/opcodes/sysdep.h
rename to x/binutils/opcodes/sysdep.h
diff --git a/contrib/binutils/symlink-tree b/x/binutils/symlink-tree
similarity index 100%
rename from contrib/binutils/symlink-tree
rename to x/binutils/symlink-tree
diff --git a/contrib/binutils/ylwrap b/x/binutils/ylwrap
similarity index 100%
rename from contrib/binutils/ylwrap
rename to x/binutils/ylwrap