156 files changed, 182 insertions, 0 deletions
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Attrib.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Attrib.efi
new file mode 100644
index 0000000000..f6113afe36
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Attrib.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Cls.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Cls.efi
new file mode 100644
index 0000000000..f8d87f5ff4
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Cls.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Cp.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Cp.efi
new file mode 100644
index 0000000000..cf61627246
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Cp.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Date.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Date.efi
new file mode 100644
index 0000000000..24a6917ad4
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Date.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi
new file mode 100644
index 0000000000..1a7a8139d4
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi
new file mode 100644
index 0000000000..6c721a54da
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi
new file mode 100644
index 0000000000..a0bd1835d0
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Drivers.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Drivers.efi
new file mode 100644
index 0000000000..ee47c3782d
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Drivers.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Drvcfg.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Drvcfg.efi
new file mode 100644
index 0000000000..9f56d474fc
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Drvcfg.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Drvdiag.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Drvdiag.efi
new file mode 100644
index 0000000000..436dac2de2
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Drvdiag.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi
new file mode 100644
index 0000000000..49411a21db
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi
new file mode 100644
index 0000000000..afef2a75ad
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi
new file mode 100644
index 0000000000..3d6cf96b12
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Load.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Load.efi
new file mode 100644
index 0000000000..aa1d49040a
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Load.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi
new file mode 100644
index 0000000000..a445f071f1
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Ls.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Ls.efi
new file mode 100644
index 0000000000..427a8a41cc
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Ls.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Mkdir.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Mkdir.efi
new file mode 100644
index 0000000000..2d45c4725d
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Mkdir.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi
new file mode 100644
index 0000000000..218700953b
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Mv.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Mv.efi
new file mode 100644
index 0000000000..22a24d583b
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Mv.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/NShell.efi b/EdkShellBinPkg/Bin/Ia32/Apps/NShell.efi
new file mode 100644
index 0000000000..44f840245d
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/NShell.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi
new file mode 100644
index 0000000000..e4e4f953c1
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi
new file mode 100644
index 0000000000..e63b678e0a
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Resets.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Resets.efi
new file mode 100644
index 0000000000..25a31561e7
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Resets.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Rm.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Rm.efi
new file mode 100644
index 0000000000..8a69f8faba
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Rm.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi
new file mode 100644
index 0000000000..665ff5190a
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi
new file mode 100644
index 0000000000..56602b1a6b
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Time.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Time.efi
new file mode 100644
index 0000000000..cdebcbc030
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Time.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Touch.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Touch.efi
new file mode 100644
index 0000000000..02b953e68a
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Touch.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Type.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Type.efi
new file mode 100644
index 0000000000..afb9111e7d
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Type.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Unload.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Unload.efi
new file mode 100644
index 0000000000..76277c27be
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Unload.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Ver.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Ver.efi
new file mode 100644
index 0000000000..4142740493
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Ver.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Vol.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Vol.efi
new file mode 100644
index 0000000000..45d4db9521
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Vol.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi b/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi
new file mode 100644
index 0000000000..33b32e3a6e
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi b/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi
new file mode 100644
index 0000000000..bfe3433299
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi
new file mode 100644
index 0000000000..ea20575348
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi b/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi
new file mode 100644
index 0000000000..e1e55a6fdc
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi b/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi
new file mode 100644
index 0000000000..cbf37285fe
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi
new file mode 100644
index 0000000000..f3f50de02a
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/err.efi b/EdkShellBinPkg/Bin/Ia32/Apps/err.efi
new file mode 100644
index 0000000000..900e4c39df
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/err.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi b/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi
new file mode 100644
index 0000000000..b348df83e2
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/legacyboot.efi b/EdkShellBinPkg/Bin/Ia32/Apps/legacyboot.efi
new file mode 100644
index 0000000000..3999aa3dd9
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/legacyboot.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/loadfv.efi b/EdkShellBinPkg/Bin/Ia32/Apps/loadfv.efi
new file mode 100644
index 0000000000..d34833545f
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/loadfv.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi
new file mode 100644
index 0000000000..0de8eea06c
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi b/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi
new file mode 100644
index 0000000000..e792613e16
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi
new file mode 100644
index 0000000000..d0d86e7cce
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi
new file mode 100644
index 0000000000..a0607acf6a
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi b/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi
new file mode 100644
index 0000000000..33e525ab0f
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi b/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi
new file mode 100644
index 0000000000..51d34256fb
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi b/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi
new file mode 100644
index 0000000000..fec9d926a8
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi b/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi
new file mode 100644
index 0000000000..f4153e46d6
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Shell.efi b/EdkShellBinPkg/Bin/Ia32/Shell.efi
new file mode 100644
index 0000000000..a38afc11fe
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Shell.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Shell_Full.efi b/EdkShellBinPkg/Bin/Ia32/Shell_Full.efi
new file mode 100644
index 0000000000..fb5ab1eee7
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ia32/Shell_Full.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Attrib.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Attrib.efi
new file mode 100644
index 0000000000..e5fdc35b16
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Attrib.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Cls.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Cls.efi
new file mode 100644
index 0000000000..1b34ffeae0
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Cls.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Cp.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Cp.efi
new file mode 100644
index 0000000000..af487dae1c
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Cp.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Date.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Date.efi
new file mode 100644
index 0000000000..6d2ae65c69
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Date.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi
new file mode 100644
index 0000000000..1c0178b189
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi
new file mode 100644
index 0000000000..fc355deef1
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi
new file mode 100644
index 0000000000..6b6fca752d
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Drivers.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Drivers.efi
new file mode 100644
index 0000000000..3e6a5f50c8
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Drivers.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Drvcfg.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Drvcfg.efi
new file mode 100644
index 0000000000..ff4195d7cd
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Drvcfg.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Drvdiag.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Drvdiag.efi
new file mode 100644
index 0000000000..9e5aa5980a
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Drvdiag.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi
new file mode 100644
index 0000000000..0f54659453
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi
new file mode 100644
index 0000000000..474e52dafe
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi
new file mode 100644
index 0000000000..103853ac5e
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Load.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Load.efi
new file mode 100644
index 0000000000..07b8dc58e1
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Load.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/LoadFv.efi b/EdkShellBinPkg/Bin/Ipf/Apps/LoadFv.efi
new file mode 100644
index 0000000000..4975cc78ed
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/LoadFv.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi
new file mode 100644
index 0000000000..49c8664b49
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Ls.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Ls.efi
new file mode 100644
index 0000000000..620393c86d
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Ls.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Mkdir.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Mkdir.efi
new file mode 100644
index 0000000000..a588f56a74
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Mkdir.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi
new file mode 100644
index 0000000000..52150b6cd7
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Mv.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Mv.efi
new file mode 100644
index 0000000000..594d09c063
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Mv.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/NShell.efi b/EdkShellBinPkg/Bin/Ipf/Apps/NShell.efi
new file mode 100644
index 0000000000..e4afa755f2
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/NShell.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi
new file mode 100644
index 0000000000..432bd714ed
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi
new file mode 100644
index 0000000000..d4cc7d2bb7
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Resets.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Resets.efi
new file mode 100644
index 0000000000..e5b6a53463
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Resets.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Rm.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Rm.efi
new file mode 100644
index 0000000000..920524c6ad
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Rm.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi
new file mode 100644
index 0000000000..591cec6672
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi
new file mode 100644
index 0000000000..9275c7b195
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Time.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Time.efi
new file mode 100644
index 0000000000..3f30498c28
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Time.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Touch.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Touch.efi
new file mode 100644
index 0000000000..c93782ed9c
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Touch.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Type.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Type.efi
new file mode 100644
index 0000000000..a1d9f50615
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Type.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Unload.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Unload.efi
new file mode 100644
index 0000000000..67c23bd668
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Unload.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Ver.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Ver.efi
new file mode 100644
index 0000000000..fb7dd850d8
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Ver.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Vol.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Vol.efi
new file mode 100644
index 0000000000..7f4f63a858
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Vol.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi b/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi
new file mode 100644
index 0000000000..244b0d06bb
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi b/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi
new file mode 100644
index 0000000000..eaede57fd4
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi
new file mode 100644
index 0000000000..5f1ad6382a
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi b/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi
new file mode 100644
index 0000000000..9bb4d190ef
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi b/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi
new file mode 100644
index 0000000000..c7f632177e
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi
new file mode 100644
index 0000000000..d27eccf79d
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/err.efi b/EdkShellBinPkg/Bin/Ipf/Apps/err.efi
new file mode 100644
index 0000000000..b2881d7d19
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/err.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi b/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi
new file mode 100644
index 0000000000..4406a4d65e
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi
new file mode 100644
index 0000000000..a0e7f38f98
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi b/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi
new file mode 100644
index 0000000000..bf18868e8b
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi
new file mode 100644
index 0000000000..2e6044b117
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi
new file mode 100644
index 0000000000..de3d171d11
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi b/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi
new file mode 100644
index 0000000000..7a1200236d
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi b/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi
new file mode 100644
index 0000000000..f13342ea6d
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi b/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi
new file mode 100644
index 0000000000..953b9ebe5c
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi b/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi
new file mode 100644
index 0000000000..eaecbef90b
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Shell.efi b/EdkShellBinPkg/Bin/Ipf/Shell.efi
new file mode 100644
index 0000000000..fc1d751535
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Shell.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Shell_Full.efi b/EdkShellBinPkg/Bin/Ipf/Shell_Full.efi
new file mode 100644
index 0000000000..62c50bb6e8
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Ipf/Shell_Full.efi
diff --git a/EdkShellBinPkg/Bin/Shell.msa b/EdkShellBinPkg/Bin/Shell.msa
new file mode 100644
index 0000000000..a46aa03adb
--- /dev/null
+++ b/EdkShellBinPkg/Bin/Shell.msa
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <MsaHeader>
+    <ModuleName>Shell</ModuleName>
+    <ModuleType>UEFI_APPLICATION</ModuleType>
+    <GuidValue>c57ad6b7-0515-40a8-9d21-551652854e37</GuidValue>
+    <Version>1.0</Version>
+    <Abstract>Component description file for EFI Shell module.</Abstract>
+    <Description>
+      This is a binary module containing multiple binary shell applications.
+      All .efi file tagged with "ToolCode="DUMMY"" in following file list are raw EFI application
+      file, and they are can be run in shell environment.
+    </Description>
+    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
+  </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>
+    <BinaryModule>true</BinaryModule>
+    <OutputFileBasename>Shell</OutputFileBasename>
+  </ModuleDefinitions>
+  <SourceFiles>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Shell.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Attrib.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Cls.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Cp.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Date.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Dblk.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Devices.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Devtree.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Drivers.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Drvcfg.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Drvdiag.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Guid.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/IpConfig.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Load.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/LoadPciRom.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Ls.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Mkdir.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Mount.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Mv.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/NShell.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Openinfo.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Resets.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Rm.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/SmbiosView.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/TelnetMgmt.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Time.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Touch.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Type.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Unload.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Ver.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Vol.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/comp.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/dmem.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/dmpstore.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/edit.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/eficompress.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/efidecompress.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/err.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/hexedit.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/legacyboot.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/loadfv.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/mem.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/memmap.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/mm.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/mode.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/pci.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/sermode.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/stall.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/timezone.efi</Filename>
+    <Filename SupArchList="IA32">ia32/Shell_Full.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Shell_Full.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Attrib.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Cls.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Cp.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Date.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Dblk.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Devices.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Devtree.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Drivers.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Drvcfg.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Drvdiag.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Guid.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/IpConfig.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Load.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/LoadPciRom.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Ls.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Mkdir.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Mount.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Mv.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/NShell.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Openinfo.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Resets.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Rm.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/SmbiosView.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/TelnetMgmt.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Time.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Touch.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Type.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Unload.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Ver.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Vol.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/comp.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/dmem.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/dmpstore.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/edit.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/eficompress.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/efidecompress.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/err.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/hexedit.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/mem.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/memmap.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/mm.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/mode.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/pci.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/sermode.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/stall.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/timezone.efi</Filename>
+    <Filename SupArchList="IPF">ipf/Shell.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Shell_full.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Attrib.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Cls.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Cp.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Date.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Dblk.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Devices.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Devtree.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Drivers.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Drvcfg.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Drvdiag.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Guid.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/IpConfig.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Load.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/LoadPciRom.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Ls.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Mkdir.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Mount.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Mv.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/NShell.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Openinfo.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Resets.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Rm.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/SmbiosView.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/TelnetMgmt.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Time.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Touch.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Type.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Unload.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Ver.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Vol.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/comp.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/dmem.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/dmpstore.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/edit.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/eficompress.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/efidecompress.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/err.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/hexedit.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/LegacyBoot.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/LoadFv.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/mem.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/memmap.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/mm.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/mode.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/pci.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/sermode.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/stall.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/timezone.efi</Filename>
+    <Filename SupArchList="X64">x64/Shell.efi</Filename>
+  </SourceFiles>
+  <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
+  </Externs>
+</ModuleSurfaceArea>
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Attrib.efi b/EdkShellBinPkg/Bin/X64/Apps/Attrib.efi
new file mode 100644
index 0000000000..2119548722
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Attrib.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Cls.efi b/EdkShellBinPkg/Bin/X64/Apps/Cls.efi
new file mode 100644
index 0000000000..3d4a976b72
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Cls.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Cp.efi b/EdkShellBinPkg/Bin/X64/Apps/Cp.efi
new file mode 100644
index 0000000000..fdd4739bf3
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Cp.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Date.efi b/EdkShellBinPkg/Bin/X64/Apps/Date.efi
new file mode 100644
index 0000000000..b8313b4a98
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Date.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi b/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi
new file mode 100644
index 0000000000..9574abeabd
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Devices.efi b/EdkShellBinPkg/Bin/X64/Apps/Devices.efi
new file mode 100644
index 0000000000..ad5e49e343
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Devices.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi b/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi
new file mode 100644
index 0000000000..9caaddf9bf
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Drivers.efi b/EdkShellBinPkg/Bin/X64/Apps/Drivers.efi
new file mode 100644
index 0000000000..4e1e8699d8
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Drivers.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Drvcfg.efi b/EdkShellBinPkg/Bin/X64/Apps/Drvcfg.efi
new file mode 100644
index 0000000000..3895bdacb8
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Drvcfg.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Drvdiag.efi b/EdkShellBinPkg/Bin/X64/Apps/Drvdiag.efi
new file mode 100644
index 0000000000..38ebd82052
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Drvdiag.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Guid.efi b/EdkShellBinPkg/Bin/X64/Apps/Guid.efi
new file mode 100644
index 0000000000..744cd52a91
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Guid.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi
new file mode 100644
index 0000000000..e77725b109
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi
new file mode 100644
index 0000000000..f52ae9b497
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/LegacyBoot.efi b/EdkShellBinPkg/Bin/X64/Apps/LegacyBoot.efi
new file mode 100644
index 0000000000..7b32113aae
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/LegacyBoot.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Load.efi b/EdkShellBinPkg/Bin/X64/Apps/Load.efi
new file mode 100644
index 0000000000..4d33a784e6
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Load.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/LoadFv.efi b/EdkShellBinPkg/Bin/X64/Apps/LoadFv.efi
new file mode 100644
index 0000000000..ec35c2b869
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/LoadFv.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi
new file mode 100644
index 0000000000..3f9a2024a7
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Ls.efi b/EdkShellBinPkg/Bin/X64/Apps/Ls.efi
new file mode 100644
index 0000000000..f9488d58bd
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Ls.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Mkdir.efi b/EdkShellBinPkg/Bin/X64/Apps/Mkdir.efi
new file mode 100644
index 0000000000..c28e943e3e
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Mkdir.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Mount.efi b/EdkShellBinPkg/Bin/X64/Apps/Mount.efi
new file mode 100644
index 0000000000..822acfc42f
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Mount.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Mv.efi b/EdkShellBinPkg/Bin/X64/Apps/Mv.efi
new file mode 100644
index 0000000000..e25cef47a3
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Mv.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/NShell.efi b/EdkShellBinPkg/Bin/X64/Apps/NShell.efi
new file mode 100644
index 0000000000..b5b3be91fa
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/NShell.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi
new file mode 100644
index 0000000000..8936f95c13
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Ping.efi b/EdkShellBinPkg/Bin/X64/Apps/Ping.efi
new file mode 100644
index 0000000000..29c2e18327
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Ping.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Resets.efi b/EdkShellBinPkg/Bin/X64/Apps/Resets.efi
new file mode 100644
index 0000000000..00a3dd28bc
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Resets.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Rm.efi b/EdkShellBinPkg/Bin/X64/Apps/Rm.efi
new file mode 100644
index 0000000000..8dd8468e4c
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Rm.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi
new file mode 100644
index 0000000000..526605f633
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi
new file mode 100644
index 0000000000..45902feb27
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Time.efi b/EdkShellBinPkg/Bin/X64/Apps/Time.efi
new file mode 100644
index 0000000000..766677c938
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Time.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Touch.efi b/EdkShellBinPkg/Bin/X64/Apps/Touch.efi
new file mode 100644
index 0000000000..2ae09fd45d
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Touch.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Type.efi b/EdkShellBinPkg/Bin/X64/Apps/Type.efi
new file mode 100644
index 0000000000..3b5cc9439c
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Type.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Unload.efi b/EdkShellBinPkg/Bin/X64/Apps/Unload.efi
new file mode 100644
index 0000000000..a200f34940
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Unload.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Ver.efi b/EdkShellBinPkg/Bin/X64/Apps/Ver.efi
new file mode 100644
index 0000000000..5b963ac7f1
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Ver.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Vol.efi b/EdkShellBinPkg/Bin/X64/Apps/Vol.efi
new file mode 100644
index 0000000000..35dbbc9464
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/Vol.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/comp.efi b/EdkShellBinPkg/Bin/X64/Apps/comp.efi
new file mode 100644
index 0000000000..1531b5fc89
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/comp.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/dmem.efi b/EdkShellBinPkg/Bin/X64/Apps/dmem.efi
new file mode 100644
index 0000000000..82d7a2ffd5
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/dmem.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi
new file mode 100644
index 0000000000..712fedcc32
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/edit.efi b/EdkShellBinPkg/Bin/X64/Apps/edit.efi
new file mode 100644
index 0000000000..9c37f41ea3
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/edit.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi b/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi
new file mode 100644
index 0000000000..9aeab7d8d1
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi
new file mode 100644
index 0000000000..bf0d0feb8f
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/err.efi b/EdkShellBinPkg/Bin/X64/Apps/err.efi
new file mode 100644
index 0000000000..af7fb5f020
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/err.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi b/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi
new file mode 100644
index 0000000000..3fb59af129
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/mem.efi b/EdkShellBinPkg/Bin/X64/Apps/mem.efi
new file mode 100644
index 0000000000..3e1076449c
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/mem.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/memmap.efi b/EdkShellBinPkg/Bin/X64/Apps/memmap.efi
new file mode 100644
index 0000000000..668447b805
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/memmap.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/mm.efi b/EdkShellBinPkg/Bin/X64/Apps/mm.efi
new file mode 100644
index 0000000000..6f77ec0411
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/mm.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/mode.efi b/EdkShellBinPkg/Bin/X64/Apps/mode.efi
new file mode 100644
index 0000000000..67163f08e5
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/mode.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/pci.efi b/EdkShellBinPkg/Bin/X64/Apps/pci.efi
new file mode 100644
index 0000000000..f3f50ae637
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/pci.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/sermode.efi b/EdkShellBinPkg/Bin/X64/Apps/sermode.efi
new file mode 100644
index 0000000000..52c24297d0
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/sermode.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/stall.efi b/EdkShellBinPkg/Bin/X64/Apps/stall.efi
new file mode 100644
index 0000000000..13b347f083
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/stall.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/timezone.efi b/EdkShellBinPkg/Bin/X64/Apps/timezone.efi
new file mode 100644
index 0000000000..2a81c5858e
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Apps/timezone.efi
diff --git a/EdkShellBinPkg/Bin/X64/Shell.efi b/EdkShellBinPkg/Bin/X64/Shell.efi
new file mode 100644
index 0000000000..1174584dee
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Shell.efi
diff --git a/EdkShellBinPkg/Bin/X64/Shell_full.efi b/EdkShellBinPkg/Bin/X64/Shell_full.efi
new file mode 100644
index 0000000000..d525497029
--- /dev/null
+++ b/EdkShellBinPkg/Bin/X64/Shell_full.efi