diff --git a/EdkShellBinPkg/bin/ipf/Apps/Attrib.efi b/EdkShellBinPkg/bin/Ipf/Apps/Attrib.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Attrib.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Attrib.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Cls.efi b/EdkShellBinPkg/bin/Ipf/Apps/Cls.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Cls.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Cls.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Cp.efi b/EdkShellBinPkg/bin/Ipf/Apps/Cp.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Cp.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Cp.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Date.efi b/EdkShellBinPkg/bin/Ipf/Apps/Date.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Date.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Date.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Dblk.efi b/EdkShellBinPkg/bin/Ipf/Apps/Dblk.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Dblk.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Dblk.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Devices.efi b/EdkShellBinPkg/bin/Ipf/Apps/Devices.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Devices.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Devices.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Devtree.efi b/EdkShellBinPkg/bin/Ipf/Apps/Devtree.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Devtree.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Drivers.efi b/EdkShellBinPkg/bin/Ipf/Apps/Drivers.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Drivers.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Drivers.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Drvcfg.efi b/EdkShellBinPkg/bin/Ipf/Apps/Drvcfg.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Drvcfg.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Drvcfg.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Drvdiag.efi b/EdkShellBinPkg/bin/Ipf/Apps/Drvdiag.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Drvdiag.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Drvdiag.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Guid.efi b/EdkShellBinPkg/bin/Ipf/Apps/Guid.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Guid.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Guid.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/IfConfig.efi b/EdkShellBinPkg/bin/Ipf/Apps/IfConfig.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/IfConfig.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/IfConfig.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/IpConfig.efi b/EdkShellBinPkg/bin/Ipf/Apps/IpConfig.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/IpConfig.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Load.efi b/EdkShellBinPkg/bin/Ipf/Apps/Load.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Load.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Load.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/LoadFv.efi b/EdkShellBinPkg/bin/Ipf/Apps/LoadFv.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/LoadFv.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/LoadFv.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/LoadPciRom.efi b/EdkShellBinPkg/bin/Ipf/Apps/LoadPciRom.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/LoadPciRom.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Ls.efi b/EdkShellBinPkg/bin/Ipf/Apps/Ls.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Ls.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Ls.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Mkdir.efi b/EdkShellBinPkg/bin/Ipf/Apps/Mkdir.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Mkdir.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Mkdir.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Mount.efi b/EdkShellBinPkg/bin/Ipf/Apps/Mount.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Mount.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Mount.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Mv.efi b/EdkShellBinPkg/bin/Ipf/Apps/Mv.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Mv.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Mv.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/NShell.efi b/EdkShellBinPkg/bin/Ipf/Apps/NShell.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/NShell.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/NShell.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Openinfo.efi b/EdkShellBinPkg/bin/Ipf/Apps/Openinfo.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Openinfo.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Openinfo.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Ping.efi b/EdkShellBinPkg/bin/Ipf/Apps/Ping.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Ping.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Ping.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Resets.efi b/EdkShellBinPkg/bin/Ipf/Apps/Resets.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Resets.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Resets.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Rm.efi b/EdkShellBinPkg/bin/Ipf/Apps/Rm.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Rm.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Rm.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/SmbiosView.efi b/EdkShellBinPkg/bin/Ipf/Apps/SmbiosView.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/SmbiosView.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/SmbiosView.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/TelnetMgmt.efi b/EdkShellBinPkg/bin/Ipf/Apps/TelnetMgmt.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/TelnetMgmt.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Time.efi b/EdkShellBinPkg/bin/Ipf/Apps/Time.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Time.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Time.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Touch.efi b/EdkShellBinPkg/bin/Ipf/Apps/Touch.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Touch.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Touch.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Type.efi b/EdkShellBinPkg/bin/Ipf/Apps/Type.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Type.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Type.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Unload.efi b/EdkShellBinPkg/bin/Ipf/Apps/Unload.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Unload.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Unload.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Ver.efi b/EdkShellBinPkg/bin/Ipf/Apps/Ver.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Ver.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Ver.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Vol.efi b/EdkShellBinPkg/bin/Ipf/Apps/Vol.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/Vol.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/Vol.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/comp.efi b/EdkShellBinPkg/bin/Ipf/Apps/comp.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/comp.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/comp.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/dmem.efi b/EdkShellBinPkg/bin/Ipf/Apps/dmem.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/dmem.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/dmem.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/dmpstore.efi b/EdkShellBinPkg/bin/Ipf/Apps/dmpstore.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/dmpstore.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/dmpstore.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/edit.efi b/EdkShellBinPkg/bin/Ipf/Apps/edit.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/edit.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/edit.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/eficompress.efi b/EdkShellBinPkg/bin/Ipf/Apps/eficompress.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/eficompress.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/eficompress.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/efidecompress.efi b/EdkShellBinPkg/bin/Ipf/Apps/efidecompress.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/efidecompress.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/efidecompress.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/err.efi b/EdkShellBinPkg/bin/Ipf/Apps/err.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/err.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/err.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/hexedit.efi b/EdkShellBinPkg/bin/Ipf/Apps/hexedit.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/hexedit.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/hexedit.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/mem.efi b/EdkShellBinPkg/bin/Ipf/Apps/mem.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/mem.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/mem.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/memmap.efi b/EdkShellBinPkg/bin/Ipf/Apps/memmap.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/memmap.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/memmap.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/mm.efi b/EdkShellBinPkg/bin/Ipf/Apps/mm.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/mm.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/mm.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/mode.efi b/EdkShellBinPkg/bin/Ipf/Apps/mode.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/mode.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/mode.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/pci.efi b/EdkShellBinPkg/bin/Ipf/Apps/pci.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/pci.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/pci.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/sermode.efi b/EdkShellBinPkg/bin/Ipf/Apps/sermode.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/sermode.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/sermode.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/stall.efi b/EdkShellBinPkg/bin/Ipf/Apps/stall.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/stall.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/stall.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/timezone.efi b/EdkShellBinPkg/bin/Ipf/Apps/timezone.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Apps/timezone.efi
rename to EdkShellBinPkg/bin/Ipf/Apps/timezone.efi
diff --git a/EdkShellBinPkg/bin/ipf/Shell.efi b/EdkShellBinPkg/bin/Ipf/Shell.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Shell.efi
rename to EdkShellBinPkg/bin/Ipf/Shell.efi
diff --git a/EdkShellBinPkg/bin/ipf/Shell_Full.efi b/EdkShellBinPkg/bin/Ipf/Shell_Full.efi
similarity index 100%
rename from EdkShellBinPkg/bin/ipf/Shell_Full.efi
rename to EdkShellBinPkg/bin/Ipf/Shell_Full.efi