diff --git a/gnu-efi-3.0/ChangeLog b/ChangeLog
similarity index 100%
rename from gnu-efi-3.0/ChangeLog
rename to ChangeLog
diff --git a/gnu-efi-3.0/Make.defaults b/Make.defaults
similarity index 100%
rename from gnu-efi-3.0/Make.defaults
rename to Make.defaults
diff --git a/gnu-efi-3.0/Make.rules b/Make.rules
similarity index 100%
rename from gnu-efi-3.0/Make.rules
rename to Make.rules
diff --git a/gnu-efi-3.0/Makefile b/Makefile
similarity index 100%
rename from gnu-efi-3.0/Makefile
rename to Makefile
diff --git a/gnu-efi-3.0/README.efilib b/README.efilib
similarity index 100%
rename from gnu-efi-3.0/README.efilib
rename to README.efilib
diff --git a/gnu-efi-3.0/README.elilo b/README.elilo
similarity index 100%
rename from gnu-efi-3.0/README.elilo
rename to README.elilo
diff --git a/gnu-efi-3.0/README.gnuefi b/README.gnuefi
similarity index 100%
rename from gnu-efi-3.0/README.gnuefi
rename to README.gnuefi
diff --git a/gnu-efi-3.0/apps/AllocPages.c b/apps/AllocPages.c
similarity index 100%
rename from gnu-efi-3.0/apps/AllocPages.c
rename to apps/AllocPages.c
diff --git a/gnu-efi-3.0/apps/FreePages.c b/apps/FreePages.c
similarity index 100%
rename from gnu-efi-3.0/apps/FreePages.c
rename to apps/FreePages.c
diff --git a/gnu-efi-3.0/apps/Makefile b/apps/Makefile
similarity index 100%
rename from gnu-efi-3.0/apps/Makefile
rename to apps/Makefile
diff --git a/gnu-efi-3.0/apps/drv0.c b/apps/drv0.c
similarity index 100%
rename from gnu-efi-3.0/apps/drv0.c
rename to apps/drv0.c
diff --git a/gnu-efi-3.0/apps/drv0.h b/apps/drv0.h
similarity index 100%
rename from gnu-efi-3.0/apps/drv0.h
rename to apps/drv0.h
diff --git a/gnu-efi-3.0/apps/drv0_use.c b/apps/drv0_use.c
similarity index 100%
rename from gnu-efi-3.0/apps/drv0_use.c
rename to apps/drv0_use.c
diff --git a/gnu-efi-3.0/apps/modelist.c b/apps/modelist.c
similarity index 100%
rename from gnu-efi-3.0/apps/modelist.c
rename to apps/modelist.c
diff --git a/gnu-efi-3.0/apps/printenv.c b/apps/printenv.c
similarity index 100%
rename from gnu-efi-3.0/apps/printenv.c
rename to apps/printenv.c
diff --git a/gnu-efi-3.0/apps/route80h.c b/apps/route80h.c
similarity index 100%
rename from gnu-efi-3.0/apps/route80h.c
rename to apps/route80h.c
diff --git a/gnu-efi-3.0/apps/t.c b/apps/t.c
similarity index 100%
rename from gnu-efi-3.0/apps/t.c
rename to apps/t.c
diff --git a/gnu-efi-3.0/apps/t2.c b/apps/t2.c
similarity index 100%
rename from gnu-efi-3.0/apps/t2.c
rename to apps/t2.c
diff --git a/gnu-efi-3.0/apps/t3.c b/apps/t3.c
similarity index 100%
rename from gnu-efi-3.0/apps/t3.c
rename to apps/t3.c
diff --git a/gnu-efi-3.0/apps/t4.c b/apps/t4.c
similarity index 100%
rename from gnu-efi-3.0/apps/t4.c
rename to apps/t4.c
diff --git a/gnu-efi-3.0/apps/t5.c b/apps/t5.c
similarity index 100%
rename from gnu-efi-3.0/apps/t5.c
rename to apps/t5.c
diff --git a/gnu-efi-3.0/apps/t6.c b/apps/t6.c
similarity index 100%
rename from gnu-efi-3.0/apps/t6.c
rename to apps/t6.c
diff --git a/gnu-efi-3.0/apps/t7.c b/apps/t7.c
similarity index 100%
rename from gnu-efi-3.0/apps/t7.c
rename to apps/t7.c
diff --git a/gnu-efi-3.0/apps/t8.c b/apps/t8.c
similarity index 100%
rename from gnu-efi-3.0/apps/t8.c
rename to apps/t8.c
diff --git a/gnu-efi-3.0/apps/tcc.c b/apps/tcc.c
similarity index 100%
rename from gnu-efi-3.0/apps/tcc.c
rename to apps/tcc.c
diff --git a/gnu-efi-3.0/apps/tpause.c b/apps/tpause.c
similarity index 100%
rename from gnu-efi-3.0/apps/tpause.c
rename to apps/tpause.c
diff --git a/gnu-efi-3.0/apps/trivial.S b/apps/trivial.S
similarity index 100%
rename from gnu-efi-3.0/apps/trivial.S
rename to apps/trivial.S
diff --git a/gnu-efi-3.0/gnuefi/Makefile b/gnuefi/Makefile
similarity index 100%
rename from gnu-efi-3.0/gnuefi/Makefile
rename to gnuefi/Makefile
diff --git a/gnu-efi-3.0/gnuefi/crt0-efi-aarch64.S b/gnuefi/crt0-efi-aarch64.S
similarity index 100%
rename from gnu-efi-3.0/gnuefi/crt0-efi-aarch64.S
rename to gnuefi/crt0-efi-aarch64.S
diff --git a/gnu-efi-3.0/gnuefi/crt0-efi-arm.S b/gnuefi/crt0-efi-arm.S
similarity index 100%
rename from gnu-efi-3.0/gnuefi/crt0-efi-arm.S
rename to gnuefi/crt0-efi-arm.S
diff --git a/gnu-efi-3.0/gnuefi/crt0-efi-ia32.S b/gnuefi/crt0-efi-ia32.S
similarity index 100%
rename from gnu-efi-3.0/gnuefi/crt0-efi-ia32.S
rename to gnuefi/crt0-efi-ia32.S
diff --git a/gnu-efi-3.0/gnuefi/crt0-efi-ia64.S b/gnuefi/crt0-efi-ia64.S
similarity index 100%
rename from gnu-efi-3.0/gnuefi/crt0-efi-ia64.S
rename to gnuefi/crt0-efi-ia64.S
diff --git a/gnu-efi-3.0/gnuefi/crt0-efi-x86_64.S b/gnuefi/crt0-efi-x86_64.S
similarity index 100%
rename from gnu-efi-3.0/gnuefi/crt0-efi-x86_64.S
rename to gnuefi/crt0-efi-x86_64.S
diff --git a/gnu-efi-3.0/gnuefi/elf_aarch64_efi.lds b/gnuefi/elf_aarch64_efi.lds
similarity index 100%
rename from gnu-efi-3.0/gnuefi/elf_aarch64_efi.lds
rename to gnuefi/elf_aarch64_efi.lds
diff --git a/gnu-efi-3.0/gnuefi/elf_arm_efi.lds b/gnuefi/elf_arm_efi.lds
similarity index 100%
rename from gnu-efi-3.0/gnuefi/elf_arm_efi.lds
rename to gnuefi/elf_arm_efi.lds
diff --git a/gnu-efi-3.0/gnuefi/elf_ia32_efi.lds b/gnuefi/elf_ia32_efi.lds
similarity index 100%
rename from gnu-efi-3.0/gnuefi/elf_ia32_efi.lds
rename to gnuefi/elf_ia32_efi.lds
diff --git a/gnu-efi-3.0/gnuefi/elf_ia32_fbsd_efi.lds b/gnuefi/elf_ia32_fbsd_efi.lds
similarity index 100%
rename from gnu-efi-3.0/gnuefi/elf_ia32_fbsd_efi.lds
rename to gnuefi/elf_ia32_fbsd_efi.lds
diff --git a/gnu-efi-3.0/gnuefi/elf_ia64_efi.lds b/gnuefi/elf_ia64_efi.lds
similarity index 100%
rename from gnu-efi-3.0/gnuefi/elf_ia64_efi.lds
rename to gnuefi/elf_ia64_efi.lds
diff --git a/gnu-efi-3.0/gnuefi/elf_x86_64_efi.lds b/gnuefi/elf_x86_64_efi.lds
similarity index 100%
rename from gnu-efi-3.0/gnuefi/elf_x86_64_efi.lds
rename to gnuefi/elf_x86_64_efi.lds
diff --git a/gnu-efi-3.0/gnuefi/elf_x86_64_fbsd_efi.lds b/gnuefi/elf_x86_64_fbsd_efi.lds
similarity index 100%
rename from gnu-efi-3.0/gnuefi/elf_x86_64_fbsd_efi.lds
rename to gnuefi/elf_x86_64_fbsd_efi.lds
diff --git a/gnu-efi-3.0/gnuefi/reloc_aarch64.c b/gnuefi/reloc_aarch64.c
similarity index 100%
rename from gnu-efi-3.0/gnuefi/reloc_aarch64.c
rename to gnuefi/reloc_aarch64.c
diff --git a/gnu-efi-3.0/gnuefi/reloc_arm.c b/gnuefi/reloc_arm.c
similarity index 100%
rename from gnu-efi-3.0/gnuefi/reloc_arm.c
rename to gnuefi/reloc_arm.c
diff --git a/gnu-efi-3.0/gnuefi/reloc_ia32.c b/gnuefi/reloc_ia32.c
similarity index 100%
rename from gnu-efi-3.0/gnuefi/reloc_ia32.c
rename to gnuefi/reloc_ia32.c
diff --git a/gnu-efi-3.0/gnuefi/reloc_ia64.S b/gnuefi/reloc_ia64.S
similarity index 100%
rename from gnu-efi-3.0/gnuefi/reloc_ia64.S
rename to gnuefi/reloc_ia64.S
diff --git a/gnu-efi-3.0/gnuefi/reloc_x86_64.c b/gnuefi/reloc_x86_64.c
similarity index 100%
rename from gnu-efi-3.0/gnuefi/reloc_x86_64.c
rename to gnuefi/reloc_x86_64.c
diff --git a/gnu-efi-3.0/inc/Makefile b/inc/Makefile
similarity index 100%
rename from gnu-efi-3.0/inc/Makefile
rename to inc/Makefile
diff --git a/gnu-efi-3.0/inc/aarch64/efibind.h b/inc/aarch64/efibind.h
similarity index 100%
rename from gnu-efi-3.0/inc/aarch64/efibind.h
rename to inc/aarch64/efibind.h
diff --git a/gnu-efi-3.0/inc/aarch64/efilibplat.h b/inc/aarch64/efilibplat.h
similarity index 100%
rename from gnu-efi-3.0/inc/aarch64/efilibplat.h
rename to inc/aarch64/efilibplat.h
diff --git a/gnu-efi-3.0/inc/arm/efibind.h b/inc/arm/efibind.h
similarity index 100%
rename from gnu-efi-3.0/inc/arm/efibind.h
rename to inc/arm/efibind.h
diff --git a/gnu-efi-3.0/inc/arm/efilibplat.h b/inc/arm/efilibplat.h
similarity index 100%
rename from gnu-efi-3.0/inc/arm/efilibplat.h
rename to inc/arm/efilibplat.h
diff --git a/gnu-efi-3.0/inc/efi.h b/inc/efi.h
similarity index 100%
rename from gnu-efi-3.0/inc/efi.h
rename to inc/efi.h
diff --git a/gnu-efi-3.0/inc/efi_nii.h b/inc/efi_nii.h
similarity index 100%
rename from gnu-efi-3.0/inc/efi_nii.h
rename to inc/efi_nii.h
diff --git a/gnu-efi-3.0/inc/efi_pxe.h b/inc/efi_pxe.h
similarity index 100%
rename from gnu-efi-3.0/inc/efi_pxe.h
rename to inc/efi_pxe.h
diff --git a/gnu-efi-3.0/inc/efiapi.h b/inc/efiapi.h
similarity index 100%
rename from gnu-efi-3.0/inc/efiapi.h
rename to inc/efiapi.h
diff --git a/gnu-efi-3.0/inc/eficon.h b/inc/eficon.h
similarity index 100%
rename from gnu-efi-3.0/inc/eficon.h
rename to inc/eficon.h
diff --git a/gnu-efi-3.0/inc/efidebug.h b/inc/efidebug.h
similarity index 100%
rename from gnu-efi-3.0/inc/efidebug.h
rename to inc/efidebug.h
diff --git a/gnu-efi-3.0/inc/efidef.h b/inc/efidef.h
similarity index 100%
rename from gnu-efi-3.0/inc/efidef.h
rename to inc/efidef.h
diff --git a/gnu-efi-3.0/inc/efidevp.h b/inc/efidevp.h
similarity index 100%
rename from gnu-efi-3.0/inc/efidevp.h
rename to inc/efidevp.h
diff --git a/gnu-efi-3.0/inc/efierr.h b/inc/efierr.h
similarity index 100%
rename from gnu-efi-3.0/inc/efierr.h
rename to inc/efierr.h
diff --git a/gnu-efi-3.0/inc/efifs.h b/inc/efifs.h
similarity index 100%
rename from gnu-efi-3.0/inc/efifs.h
rename to inc/efifs.h
diff --git a/gnu-efi-3.0/inc/efigpt.h b/inc/efigpt.h
similarity index 100%
rename from gnu-efi-3.0/inc/efigpt.h
rename to inc/efigpt.h
diff --git a/gnu-efi-3.0/inc/efiip.h b/inc/efiip.h
similarity index 100%
rename from gnu-efi-3.0/inc/efiip.h
rename to inc/efiip.h
diff --git a/gnu-efi-3.0/inc/efilib.h b/inc/efilib.h
similarity index 100%
rename from gnu-efi-3.0/inc/efilib.h
rename to inc/efilib.h
diff --git a/gnu-efi-3.0/inc/efilink.h b/inc/efilink.h
similarity index 100%
rename from gnu-efi-3.0/inc/efilink.h
rename to inc/efilink.h
diff --git a/gnu-efi-3.0/inc/efinet.h b/inc/efinet.h
similarity index 100%
rename from gnu-efi-3.0/inc/efinet.h
rename to inc/efinet.h
diff --git a/gnu-efi-3.0/inc/efipart.h b/inc/efipart.h
similarity index 100%
rename from gnu-efi-3.0/inc/efipart.h
rename to inc/efipart.h
diff --git a/gnu-efi-3.0/inc/efipciio.h b/inc/efipciio.h
similarity index 100%
rename from gnu-efi-3.0/inc/efipciio.h
rename to inc/efipciio.h
diff --git a/gnu-efi-3.0/inc/efipoint.h b/inc/efipoint.h
similarity index 100%
rename from gnu-efi-3.0/inc/efipoint.h
rename to inc/efipoint.h
diff --git a/gnu-efi-3.0/inc/efiprot.h b/inc/efiprot.h
similarity index 100%
rename from gnu-efi-3.0/inc/efiprot.h
rename to inc/efiprot.h
diff --git a/gnu-efi-3.0/inc/efipxebc.h b/inc/efipxebc.h
similarity index 100%
rename from gnu-efi-3.0/inc/efipxebc.h
rename to inc/efipxebc.h
diff --git a/gnu-efi-3.0/inc/efirtlib.h b/inc/efirtlib.h
similarity index 100%
rename from gnu-efi-3.0/inc/efirtlib.h
rename to inc/efirtlib.h
diff --git a/gnu-efi-3.0/inc/efiser.h b/inc/efiser.h
similarity index 100%
rename from gnu-efi-3.0/inc/efiser.h
rename to inc/efiser.h
diff --git a/gnu-efi-3.0/inc/efishellintf.h b/inc/efishellintf.h
similarity index 100%
rename from gnu-efi-3.0/inc/efishellintf.h
rename to inc/efishellintf.h
diff --git a/gnu-efi-3.0/inc/efishellparm.h b/inc/efishellparm.h
similarity index 100%
rename from gnu-efi-3.0/inc/efishellparm.h
rename to inc/efishellparm.h
diff --git a/gnu-efi-3.0/inc/efistdarg.h b/inc/efistdarg.h
similarity index 100%
rename from gnu-efi-3.0/inc/efistdarg.h
rename to inc/efistdarg.h
diff --git a/gnu-efi-3.0/inc/efitcp.h b/inc/efitcp.h
similarity index 100%
rename from gnu-efi-3.0/inc/efitcp.h
rename to inc/efitcp.h
diff --git a/gnu-efi-3.0/inc/efiudp.h b/inc/efiudp.h
similarity index 100%
rename from gnu-efi-3.0/inc/efiudp.h
rename to inc/efiudp.h
diff --git a/gnu-efi-3.0/inc/efiui.h b/inc/efiui.h
similarity index 100%
rename from gnu-efi-3.0/inc/efiui.h
rename to inc/efiui.h
diff --git a/gnu-efi-3.0/inc/ia32/efibind.h b/inc/ia32/efibind.h
similarity index 100%
rename from gnu-efi-3.0/inc/ia32/efibind.h
rename to inc/ia32/efibind.h
diff --git a/gnu-efi-3.0/inc/ia32/efilibplat.h b/inc/ia32/efilibplat.h
similarity index 100%
rename from gnu-efi-3.0/inc/ia32/efilibplat.h
rename to inc/ia32/efilibplat.h
diff --git a/gnu-efi-3.0/inc/ia32/pe.h b/inc/ia32/pe.h
similarity index 100%
rename from gnu-efi-3.0/inc/ia32/pe.h
rename to inc/ia32/pe.h
diff --git a/gnu-efi-3.0/inc/ia64/efibind.h b/inc/ia64/efibind.h
similarity index 100%
rename from gnu-efi-3.0/inc/ia64/efibind.h
rename to inc/ia64/efibind.h
diff --git a/gnu-efi-3.0/inc/ia64/efilibplat.h b/inc/ia64/efilibplat.h
similarity index 100%
rename from gnu-efi-3.0/inc/ia64/efilibplat.h
rename to inc/ia64/efilibplat.h
diff --git a/gnu-efi-3.0/inc/ia64/pe.h b/inc/ia64/pe.h
similarity index 100%
rename from gnu-efi-3.0/inc/ia64/pe.h
rename to inc/ia64/pe.h
diff --git a/gnu-efi-3.0/inc/ia64/salproc.h b/inc/ia64/salproc.h
similarity index 100%
rename from gnu-efi-3.0/inc/ia64/salproc.h
rename to inc/ia64/salproc.h
diff --git a/gnu-efi-3.0/inc/inc.mak b/inc/inc.mak
similarity index 100%
rename from gnu-efi-3.0/inc/inc.mak
rename to inc/inc.mak
diff --git a/gnu-efi-3.0/inc/libsmbios.h b/inc/libsmbios.h
similarity index 100%
rename from gnu-efi-3.0/inc/libsmbios.h
rename to inc/libsmbios.h
diff --git a/gnu-efi-3.0/inc/make.inf b/inc/make.inf
similarity index 100%
rename from gnu-efi-3.0/inc/make.inf
rename to inc/make.inf
diff --git a/gnu-efi-3.0/inc/makefile.hdr b/inc/makefile.hdr
similarity index 100%
rename from gnu-efi-3.0/inc/makefile.hdr
rename to inc/makefile.hdr
diff --git a/gnu-efi-3.0/inc/pci22.h b/inc/pci22.h
similarity index 100%
rename from gnu-efi-3.0/inc/pci22.h
rename to inc/pci22.h
diff --git a/gnu-efi-3.0/inc/protocol/adapterdebug.h b/inc/protocol/adapterdebug.h
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/adapterdebug.h
rename to inc/protocol/adapterdebug.h
diff --git a/gnu-efi-3.0/inc/protocol/eficonsplit.h b/inc/protocol/eficonsplit.h
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/eficonsplit.h
rename to inc/protocol/eficonsplit.h
diff --git a/gnu-efi-3.0/inc/protocol/efidbg.h b/inc/protocol/efidbg.h
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/efidbg.h
rename to inc/protocol/efidbg.h
diff --git a/gnu-efi-3.0/inc/protocol/efivar.h b/inc/protocol/efivar.h
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/efivar.h
rename to inc/protocol/efivar.h
diff --git a/gnu-efi-3.0/inc/protocol/ia64/eficontext.h b/inc/protocol/ia64/eficontext.h
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/ia64/eficontext.h
rename to inc/protocol/ia64/eficontext.h
diff --git a/gnu-efi-3.0/inc/protocol/intload.h b/inc/protocol/intload.h
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/intload.h
rename to inc/protocol/intload.h
diff --git a/gnu-efi-3.0/inc/protocol/legacyboot.h b/inc/protocol/legacyboot.h
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/legacyboot.h
rename to inc/protocol/legacyboot.h
diff --git a/gnu-efi-3.0/inc/protocol/make.inf b/inc/protocol/make.inf
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/make.inf
rename to inc/protocol/make.inf
diff --git a/gnu-efi-3.0/inc/protocol/makefile.hdr b/inc/protocol/makefile.hdr
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/makefile.hdr
rename to inc/protocol/makefile.hdr
diff --git a/gnu-efi-3.0/inc/protocol/piflash64.h b/inc/protocol/piflash64.h
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/piflash64.h
rename to inc/protocol/piflash64.h
diff --git a/gnu-efi-3.0/inc/protocol/readme.txt b/inc/protocol/readme.txt
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/readme.txt
rename to inc/protocol/readme.txt
diff --git a/gnu-efi-3.0/inc/protocol/vgaclass.h b/inc/protocol/vgaclass.h
similarity index 100%
rename from gnu-efi-3.0/inc/protocol/vgaclass.h
rename to inc/protocol/vgaclass.h
diff --git a/gnu-efi-3.0/inc/romload.h b/inc/romload.h
similarity index 100%
rename from gnu-efi-3.0/inc/romload.h
rename to inc/romload.h
diff --git a/gnu-efi-3.0/inc/x86_64/efibind.h b/inc/x86_64/efibind.h
similarity index 100%
rename from gnu-efi-3.0/inc/x86_64/efibind.h
rename to inc/x86_64/efibind.h
diff --git a/gnu-efi-3.0/inc/x86_64/efilibplat.h b/inc/x86_64/efilibplat.h
similarity index 100%
rename from gnu-efi-3.0/inc/x86_64/efilibplat.h
rename to inc/x86_64/efilibplat.h
diff --git a/gnu-efi-3.0/inc/x86_64/pe.h b/inc/x86_64/pe.h
similarity index 100%
rename from gnu-efi-3.0/inc/x86_64/pe.h
rename to inc/x86_64/pe.h
diff --git a/gnu-efi-3.0/lib/Makefile b/lib/Makefile
similarity index 100%
rename from gnu-efi-3.0/lib/Makefile
rename to lib/Makefile
diff --git a/gnu-efi-3.0/lib/aarch64/efi_stub.S b/lib/aarch64/efi_stub.S
similarity index 100%
rename from gnu-efi-3.0/lib/aarch64/efi_stub.S
rename to lib/aarch64/efi_stub.S
diff --git a/gnu-efi-3.0/lib/aarch64/initplat.c b/lib/aarch64/initplat.c
similarity index 100%
rename from gnu-efi-3.0/lib/aarch64/initplat.c
rename to lib/aarch64/initplat.c
diff --git a/gnu-efi-3.0/lib/aarch64/math.c b/lib/aarch64/math.c
similarity index 100%
rename from gnu-efi-3.0/lib/aarch64/math.c
rename to lib/aarch64/math.c
diff --git a/gnu-efi-3.0/lib/arm/div64.S b/lib/arm/div64.S
similarity index 100%
rename from gnu-efi-3.0/lib/arm/div64.S
rename to lib/arm/div64.S
diff --git a/gnu-efi-3.0/lib/arm/efi_stub.S b/lib/arm/efi_stub.S
similarity index 100%
rename from gnu-efi-3.0/lib/arm/efi_stub.S
rename to lib/arm/efi_stub.S
diff --git a/gnu-efi-3.0/lib/arm/initplat.c b/lib/arm/initplat.c
similarity index 100%
rename from gnu-efi-3.0/lib/arm/initplat.c
rename to lib/arm/initplat.c
diff --git a/gnu-efi-3.0/lib/arm/lib1funcs.S b/lib/arm/lib1funcs.S
similarity index 100%
rename from gnu-efi-3.0/lib/arm/lib1funcs.S
rename to lib/arm/lib1funcs.S
diff --git a/gnu-efi-3.0/lib/arm/math.c b/lib/arm/math.c
similarity index 100%
rename from gnu-efi-3.0/lib/arm/math.c
rename to lib/arm/math.c
diff --git a/gnu-efi-3.0/lib/boxdraw.c b/lib/boxdraw.c
similarity index 100%
rename from gnu-efi-3.0/lib/boxdraw.c
rename to lib/boxdraw.c
diff --git a/gnu-efi-3.0/lib/cmdline.c b/lib/cmdline.c
similarity index 100%
rename from gnu-efi-3.0/lib/cmdline.c
rename to lib/cmdline.c
diff --git a/gnu-efi-3.0/lib/console.c b/lib/console.c
similarity index 100%
rename from gnu-efi-3.0/lib/console.c
rename to lib/console.c
diff --git a/gnu-efi-3.0/lib/crc.c b/lib/crc.c
similarity index 100%
rename from gnu-efi-3.0/lib/crc.c
rename to lib/crc.c
diff --git a/gnu-efi-3.0/lib/data.c b/lib/data.c
similarity index 100%
rename from gnu-efi-3.0/lib/data.c
rename to lib/data.c
diff --git a/gnu-efi-3.0/lib/debug.c b/lib/debug.c
similarity index 100%
rename from gnu-efi-3.0/lib/debug.c
rename to lib/debug.c
diff --git a/gnu-efi-3.0/lib/dpath.c b/lib/dpath.c
similarity index 100%
rename from gnu-efi-3.0/lib/dpath.c
rename to lib/dpath.c
diff --git a/gnu-efi-3.0/lib/error.c b/lib/error.c
similarity index 100%
rename from gnu-efi-3.0/lib/error.c
rename to lib/error.c
diff --git a/gnu-efi-3.0/lib/event.c b/lib/event.c
similarity index 100%
rename from gnu-efi-3.0/lib/event.c
rename to lib/event.c
diff --git a/gnu-efi-3.0/lib/guid.c b/lib/guid.c
similarity index 100%
rename from gnu-efi-3.0/lib/guid.c
rename to lib/guid.c
diff --git a/gnu-efi-3.0/lib/hand.c b/lib/hand.c
similarity index 100%
rename from gnu-efi-3.0/lib/hand.c
rename to lib/hand.c
diff --git a/gnu-efi-3.0/lib/hw.c b/lib/hw.c
similarity index 100%
rename from gnu-efi-3.0/lib/hw.c
rename to lib/hw.c
diff --git a/gnu-efi-3.0/lib/ia32/efi_stub.S b/lib/ia32/efi_stub.S
similarity index 100%
rename from gnu-efi-3.0/lib/ia32/efi_stub.S
rename to lib/ia32/efi_stub.S
diff --git a/gnu-efi-3.0/lib/ia32/initplat.c b/lib/ia32/initplat.c
similarity index 100%
rename from gnu-efi-3.0/lib/ia32/initplat.c
rename to lib/ia32/initplat.c
diff --git a/gnu-efi-3.0/lib/ia32/math.c b/lib/ia32/math.c
similarity index 100%
rename from gnu-efi-3.0/lib/ia32/math.c
rename to lib/ia32/math.c
diff --git a/gnu-efi-3.0/lib/ia64/initplat.c b/lib/ia64/initplat.c
similarity index 100%
rename from gnu-efi-3.0/lib/ia64/initplat.c
rename to lib/ia64/initplat.c
diff --git a/gnu-efi-3.0/lib/ia64/math.c b/lib/ia64/math.c
similarity index 100%
rename from gnu-efi-3.0/lib/ia64/math.c
rename to lib/ia64/math.c
diff --git a/gnu-efi-3.0/lib/ia64/palproc.S b/lib/ia64/palproc.S
similarity index 100%
rename from gnu-efi-3.0/lib/ia64/palproc.S
rename to lib/ia64/palproc.S
diff --git a/gnu-efi-3.0/lib/ia64/palproc.h b/lib/ia64/palproc.h
similarity index 100%
rename from gnu-efi-3.0/lib/ia64/palproc.h
rename to lib/ia64/palproc.h
diff --git a/gnu-efi-3.0/lib/ia64/salpal.c b/lib/ia64/salpal.c
similarity index 100%
rename from gnu-efi-3.0/lib/ia64/salpal.c
rename to lib/ia64/salpal.c
diff --git a/gnu-efi-3.0/lib/init.c b/lib/init.c
similarity index 100%
rename from gnu-efi-3.0/lib/init.c
rename to lib/init.c
diff --git a/gnu-efi-3.0/lib/lib.h b/lib/lib.h
similarity index 100%
rename from gnu-efi-3.0/lib/lib.h
rename to lib/lib.h
diff --git a/gnu-efi-3.0/lib/lock.c b/lib/lock.c
similarity index 100%
rename from gnu-efi-3.0/lib/lock.c
rename to lib/lock.c
diff --git a/gnu-efi-3.0/lib/misc.c b/lib/misc.c
similarity index 100%
rename from gnu-efi-3.0/lib/misc.c
rename to lib/misc.c
diff --git a/gnu-efi-3.0/lib/print.c b/lib/print.c
similarity index 100%
rename from gnu-efi-3.0/lib/print.c
rename to lib/print.c
diff --git a/gnu-efi-3.0/lib/runtime/efirtlib.c b/lib/runtime/efirtlib.c
similarity index 100%
rename from gnu-efi-3.0/lib/runtime/efirtlib.c
rename to lib/runtime/efirtlib.c
diff --git a/gnu-efi-3.0/lib/runtime/rtdata.c b/lib/runtime/rtdata.c
similarity index 100%
rename from gnu-efi-3.0/lib/runtime/rtdata.c
rename to lib/runtime/rtdata.c
diff --git a/gnu-efi-3.0/lib/runtime/rtlock.c b/lib/runtime/rtlock.c
similarity index 100%
rename from gnu-efi-3.0/lib/runtime/rtlock.c
rename to lib/runtime/rtlock.c
diff --git a/gnu-efi-3.0/lib/runtime/rtstr.c b/lib/runtime/rtstr.c
similarity index 100%
rename from gnu-efi-3.0/lib/runtime/rtstr.c
rename to lib/runtime/rtstr.c
diff --git a/gnu-efi-3.0/lib/runtime/vm.c b/lib/runtime/vm.c
similarity index 100%
rename from gnu-efi-3.0/lib/runtime/vm.c
rename to lib/runtime/vm.c
diff --git a/gnu-efi-3.0/lib/smbios.c b/lib/smbios.c
similarity index 100%
rename from gnu-efi-3.0/lib/smbios.c
rename to lib/smbios.c
diff --git a/gnu-efi-3.0/lib/sread.c b/lib/sread.c
similarity index 100%
rename from gnu-efi-3.0/lib/sread.c
rename to lib/sread.c
diff --git a/gnu-efi-3.0/lib/str.c b/lib/str.c
similarity index 100%
rename from gnu-efi-3.0/lib/str.c
rename to lib/str.c
diff --git a/gnu-efi-3.0/lib/x86_64/callwrap.c b/lib/x86_64/callwrap.c
similarity index 100%
rename from gnu-efi-3.0/lib/x86_64/callwrap.c
rename to lib/x86_64/callwrap.c
diff --git a/gnu-efi-3.0/lib/x86_64/efi_stub.S b/lib/x86_64/efi_stub.S
similarity index 100%
rename from gnu-efi-3.0/lib/x86_64/efi_stub.S
rename to lib/x86_64/efi_stub.S
diff --git a/gnu-efi-3.0/lib/x86_64/initplat.c b/lib/x86_64/initplat.c
similarity index 100%
rename from gnu-efi-3.0/lib/x86_64/initplat.c
rename to lib/x86_64/initplat.c
diff --git a/gnu-efi-3.0/lib/x86_64/math.c b/lib/x86_64/math.c
similarity index 100%
rename from gnu-efi-3.0/lib/x86_64/math.c
rename to lib/x86_64/math.c