diff --git a/EdkShellBinPkg/bin/Shell.msa b/EdkShellBinPkg/bin/Shell.msa
index e997defba9..30f0399c9c 100644
--- a/EdkShellBinPkg/bin/Shell.msa
+++ b/EdkShellBinPkg/bin/Shell.msa
@@ -34,14 +34,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>
   </MsaHeader>
   <SourceFiles>
-    <Filename Path="ia32" FileType="EFI">Shell_Full.efi</Filename>
-    <!--
     <Arch ArchType="IA32">
-      <Filename Path="ia32" FileType="EFI">Shell_Full.efi</Filename>
+      <Filename>ia32/Shell_Full.efi</Filename>
     </Arch>
-    -->
     <Arch ArchType="IPF">
-      <Filename Path="ipf">Shell_Full.efi</Filename>
+      <Filename>ipf/Shell_Full.efi</Filename>
+    </Arch>
+    <Arch ArchType="X64">
+      <Filename>x64/Shell.efi</Filename>
     </Arch>
   </SourceFiles>
 </ModuleSurfaceArea>
diff --git a/EdkShellBinPkg/bin/x64/Apps/Attrib.efi b/EdkShellBinPkg/bin/x64/Apps/Attrib.efi
new file mode 100644
index 0000000000..0b18fb904c
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Attrib.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Cls.efi b/EdkShellBinPkg/bin/x64/Apps/Cls.efi
new file mode 100644
index 0000000000..272966ea15
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Cls.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Cp.efi b/EdkShellBinPkg/bin/x64/Apps/Cp.efi
new file mode 100644
index 0000000000..e088201561
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Cp.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Date.efi b/EdkShellBinPkg/bin/x64/Apps/Date.efi
new file mode 100644
index 0000000000..d83d5cb480
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Date.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Dblk.efi b/EdkShellBinPkg/bin/x64/Apps/Dblk.efi
new file mode 100644
index 0000000000..34888e4bf7
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Dblk.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Devices.efi b/EdkShellBinPkg/bin/x64/Apps/Devices.efi
new file mode 100644
index 0000000000..12f09cfc72
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Devices.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Devtree.efi b/EdkShellBinPkg/bin/x64/Apps/Devtree.efi
new file mode 100644
index 0000000000..28f27b007b
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Devtree.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Drivers.efi b/EdkShellBinPkg/bin/x64/Apps/Drivers.efi
new file mode 100644
index 0000000000..3a0a36859e
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Drivers.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Drvcfg.efi b/EdkShellBinPkg/bin/x64/Apps/Drvcfg.efi
new file mode 100644
index 0000000000..d4fa453ec1
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Drvcfg.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Drvdiag.efi b/EdkShellBinPkg/bin/x64/Apps/Drvdiag.efi
new file mode 100644
index 0000000000..2a4ce4b3e9
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Drvdiag.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Guid.efi b/EdkShellBinPkg/bin/x64/Apps/Guid.efi
new file mode 100644
index 0000000000..74686803ae
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Guid.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/IpConfig.efi b/EdkShellBinPkg/bin/x64/Apps/IpConfig.efi
new file mode 100644
index 0000000000..45e8306f12
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/IpConfig.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/LegacyBoot.efi b/EdkShellBinPkg/bin/x64/Apps/LegacyBoot.efi
new file mode 100644
index 0000000000..51080862eb
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/LegacyBoot.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Load.efi b/EdkShellBinPkg/bin/x64/Apps/Load.efi
new file mode 100644
index 0000000000..754b3c4530
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Load.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/LoadFv.efi b/EdkShellBinPkg/bin/x64/Apps/LoadFv.efi
new file mode 100644
index 0000000000..41c6c84d3c
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/LoadFv.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/LoadPciRom.efi b/EdkShellBinPkg/bin/x64/Apps/LoadPciRom.efi
new file mode 100644
index 0000000000..b9ff503ce8
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/LoadPciRom.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Ls.efi b/EdkShellBinPkg/bin/x64/Apps/Ls.efi
new file mode 100644
index 0000000000..0d636b204a
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Ls.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Mkdir.efi b/EdkShellBinPkg/bin/x64/Apps/Mkdir.efi
new file mode 100644
index 0000000000..e064c44ffc
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Mkdir.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Mount.efi b/EdkShellBinPkg/bin/x64/Apps/Mount.efi
new file mode 100644
index 0000000000..ff2bd234a7
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Mount.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Mv.efi b/EdkShellBinPkg/bin/x64/Apps/Mv.efi
new file mode 100644
index 0000000000..5fb1a4529a
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Mv.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/NShell.efi b/EdkShellBinPkg/bin/x64/Apps/NShell.efi
new file mode 100644
index 0000000000..0cbab52076
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/NShell.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Openinfo.efi b/EdkShellBinPkg/bin/x64/Apps/Openinfo.efi
new file mode 100644
index 0000000000..eb128c76f0
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Openinfo.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Resets.efi b/EdkShellBinPkg/bin/x64/Apps/Resets.efi
new file mode 100644
index 0000000000..16f1e1b3ca
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Resets.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Rm.efi b/EdkShellBinPkg/bin/x64/Apps/Rm.efi
new file mode 100644
index 0000000000..0b6030857c
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Rm.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/SmbiosView.efi b/EdkShellBinPkg/bin/x64/Apps/SmbiosView.efi
new file mode 100644
index 0000000000..da53ffd1fc
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/SmbiosView.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/TelnetMgmt.efi b/EdkShellBinPkg/bin/x64/Apps/TelnetMgmt.efi
new file mode 100644
index 0000000000..600a07602f
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/TelnetMgmt.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Time.efi b/EdkShellBinPkg/bin/x64/Apps/Time.efi
new file mode 100644
index 0000000000..a6d0ef8295
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Time.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Touch.efi b/EdkShellBinPkg/bin/x64/Apps/Touch.efi
new file mode 100644
index 0000000000..410056db28
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Touch.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Type.efi b/EdkShellBinPkg/bin/x64/Apps/Type.efi
new file mode 100644
index 0000000000..7bcc99d161
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Type.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Unload.efi b/EdkShellBinPkg/bin/x64/Apps/Unload.efi
new file mode 100644
index 0000000000..1e2f3a0855
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Unload.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Ver.efi b/EdkShellBinPkg/bin/x64/Apps/Ver.efi
new file mode 100644
index 0000000000..29dc2c63ad
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Ver.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Vol.efi b/EdkShellBinPkg/bin/x64/Apps/Vol.efi
new file mode 100644
index 0000000000..4d2e8dfc21
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/Vol.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/comp.efi b/EdkShellBinPkg/bin/x64/Apps/comp.efi
new file mode 100644
index 0000000000..98d977f1ec
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/comp.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/dmem.efi b/EdkShellBinPkg/bin/x64/Apps/dmem.efi
new file mode 100644
index 0000000000..66106faebe
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/dmem.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/dmpstore.efi b/EdkShellBinPkg/bin/x64/Apps/dmpstore.efi
new file mode 100644
index 0000000000..b5e5c7ac89
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/dmpstore.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/edit.efi b/EdkShellBinPkg/bin/x64/Apps/edit.efi
new file mode 100644
index 0000000000..084b85b5bb
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/edit.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/eficompress.efi b/EdkShellBinPkg/bin/x64/Apps/eficompress.efi
new file mode 100644
index 0000000000..bd436f6fcf
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/eficompress.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/efidecompress.efi b/EdkShellBinPkg/bin/x64/Apps/efidecompress.efi
new file mode 100644
index 0000000000..da3d991a28
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/efidecompress.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/err.efi b/EdkShellBinPkg/bin/x64/Apps/err.efi
new file mode 100644
index 0000000000..6688db3eed
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/err.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/hexedit.efi b/EdkShellBinPkg/bin/x64/Apps/hexedit.efi
new file mode 100644
index 0000000000..93899cc5de
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/hexedit.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/mem.efi b/EdkShellBinPkg/bin/x64/Apps/mem.efi
new file mode 100644
index 0000000000..97c551c901
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/mem.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/memmap.efi b/EdkShellBinPkg/bin/x64/Apps/memmap.efi
new file mode 100644
index 0000000000..7446cea7ff
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/memmap.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/mm.efi b/EdkShellBinPkg/bin/x64/Apps/mm.efi
new file mode 100644
index 0000000000..b684a45aca
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/mm.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/mode.efi b/EdkShellBinPkg/bin/x64/Apps/mode.efi
new file mode 100644
index 0000000000..bc01f61584
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/mode.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/pci.efi b/EdkShellBinPkg/bin/x64/Apps/pci.efi
new file mode 100644
index 0000000000..88951d4867
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/pci.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/sermode.efi b/EdkShellBinPkg/bin/x64/Apps/sermode.efi
new file mode 100644
index 0000000000..876d256b6a
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/sermode.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/stall.efi b/EdkShellBinPkg/bin/x64/Apps/stall.efi
new file mode 100644
index 0000000000..477b6896cd
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/stall.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/timezone.efi b/EdkShellBinPkg/bin/x64/Apps/timezone.efi
new file mode 100644
index 0000000000..5452fdd028
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Apps/timezone.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Shell.efi b/EdkShellBinPkg/bin/x64/Shell.efi
new file mode 100644
index 0000000000..ec05fba1c0
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Shell.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Shell_full.efi b/EdkShellBinPkg/bin/x64/Shell_full.efi
new file mode 100644
index 0000000000..c6b0a61068
Binary files /dev/null and b/EdkShellBinPkg/bin/x64/Shell_full.efi differ