diff --git a/EdkShellBinPkg/Bin/Shell.msa b/EdkShellBinPkg/Bin/Shell.msa
deleted file mode 100644
index a46aa03adb..0000000000
--- a/EdkShellBinPkg/Bin/Shell.msa
+++ /dev/null
@@ -1,182 +0,0 @@
-
-
-
- Shell
- UEFI_APPLICATION
- c57ad6b7-0515-40a8-9d21-551652854e37
- 1.0
- Component description file for EFI Shell module.
-
- 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.
-
- Copyright (c) 2006, Intel Corporation.
- 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.
- FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
-
-
- IA32 X64 IPF
- true
- Shell
-
-
- ia32/Shell.efi
- ia32/Apps/Attrib.efi
- ia32/Apps/Cls.efi
- ia32/Apps/Cp.efi
- ia32/Apps/Date.efi
- ia32/Apps/Dblk.efi
- ia32/Apps/Devices.efi
- ia32/Apps/Devtree.efi
- ia32/Apps/Drivers.efi
- ia32/Apps/Drvcfg.efi
- ia32/Apps/Drvdiag.efi
- ia32/Apps/Guid.efi
- ia32/Apps/IpConfig.efi
- ia32/Apps/Load.efi
- ia32/Apps/LoadPciRom.efi
- ia32/Apps/Ls.efi
- ia32/Apps/Mkdir.efi
- ia32/Apps/Mount.efi
- ia32/Apps/Mv.efi
- ia32/Apps/NShell.efi
- ia32/Apps/Openinfo.efi
- ia32/Apps/Resets.efi
- ia32/Apps/Rm.efi
- ia32/Apps/SmbiosView.efi
- ia32/Apps/TelnetMgmt.efi
- ia32/Apps/Time.efi
- ia32/Apps/Touch.efi
- ia32/Apps/Type.efi
- ia32/Apps/Unload.efi
- ia32/Apps/Ver.efi
- ia32/Apps/Vol.efi
- ia32/Apps/comp.efi
- ia32/Apps/dmem.efi
- ia32/Apps/dmpstore.efi
- ia32/Apps/edit.efi
- ia32/Apps/eficompress.efi
- ia32/Apps/efidecompress.efi
- ia32/Apps/err.efi
- ia32/Apps/hexedit.efi
- ia32/Apps/legacyboot.efi
- ia32/Apps/loadfv.efi
- ia32/Apps/mem.efi
- ia32/Apps/memmap.efi
- ia32/Apps/mm.efi
- ia32/Apps/mode.efi
- ia32/Apps/pci.efi
- ia32/Apps/sermode.efi
- ia32/Apps/stall.efi
- ia32/Apps/timezone.efi
- ia32/Shell_Full.efi
- ipf/Shell_Full.efi
- ipf/Apps/Attrib.efi
- ipf/Apps/Cls.efi
- ipf/Apps/Cp.efi
- ipf/Apps/Date.efi
- ipf/Apps/Dblk.efi
- ipf/Apps/Devices.efi
- ipf/Apps/Devtree.efi
- ipf/Apps/Drivers.efi
- ipf/Apps/Drvcfg.efi
- ipf/Apps/Drvdiag.efi
- ipf/Apps/Guid.efi
- ipf/Apps/IpConfig.efi
- ipf/Apps/Load.efi
- ipf/Apps/LoadPciRom.efi
- ipf/Apps/Ls.efi
- ipf/Apps/Mkdir.efi
- ipf/Apps/Mount.efi
- ipf/Apps/Mv.efi
- ipf/Apps/NShell.efi
- ipf/Apps/Openinfo.efi
- ipf/Apps/Resets.efi
- ipf/Apps/Rm.efi
- ipf/Apps/SmbiosView.efi
- ipf/Apps/TelnetMgmt.efi
- ipf/Apps/Time.efi
- ipf/Apps/Touch.efi
- ipf/Apps/Type.efi
- ipf/Apps/Unload.efi
- ipf/Apps/Ver.efi
- ipf/Apps/Vol.efi
- ipf/Apps/comp.efi
- ipf/Apps/dmem.efi
- ipf/Apps/dmpstore.efi
- ipf/Apps/edit.efi
- ipf/Apps/eficompress.efi
- ipf/Apps/efidecompress.efi
- ipf/Apps/err.efi
- ipf/Apps/hexedit.efi
- ipf/Apps/mem.efi
- ipf/Apps/memmap.efi
- ipf/Apps/mm.efi
- ipf/Apps/mode.efi
- ipf/Apps/pci.efi
- ipf/Apps/sermode.efi
- ipf/Apps/stall.efi
- ipf/Apps/timezone.efi
- ipf/Shell.efi
- x64/Shell_full.efi
- x64/Apps/Attrib.efi
- x64/Apps/Cls.efi
- x64/Apps/Cp.efi
- x64/Apps/Date.efi
- x64/Apps/Dblk.efi
- x64/Apps/Devices.efi
- x64/Apps/Devtree.efi
- x64/Apps/Drivers.efi
- x64/Apps/Drvcfg.efi
- x64/Apps/Drvdiag.efi
- x64/Apps/Guid.efi
- x64/Apps/IpConfig.efi
- x64/Apps/Load.efi
- x64/Apps/LoadPciRom.efi
- x64/Apps/Ls.efi
- x64/Apps/Mkdir.efi
- x64/Apps/Mount.efi
- x64/Apps/Mv.efi
- x64/Apps/NShell.efi
- x64/Apps/Openinfo.efi
- x64/Apps/Resets.efi
- x64/Apps/Rm.efi
- x64/Apps/SmbiosView.efi
- x64/Apps/TelnetMgmt.efi
- x64/Apps/Time.efi
- x64/Apps/Touch.efi
- x64/Apps/Type.efi
- x64/Apps/Unload.efi
- x64/Apps/Ver.efi
- x64/Apps/Vol.efi
- x64/Apps/comp.efi
- x64/Apps/dmem.efi
- x64/Apps/dmpstore.efi
- x64/Apps/edit.efi
- x64/Apps/eficompress.efi
- x64/Apps/efidecompress.efi
- x64/Apps/err.efi
- x64/Apps/hexedit.efi
- x64/Apps/LegacyBoot.efi
- x64/Apps/LoadFv.efi
- x64/Apps/mem.efi
- x64/Apps/memmap.efi
- x64/Apps/mm.efi
- x64/Apps/mode.efi
- x64/Apps/pci.efi
- x64/Apps/sermode.efi
- x64/Apps/stall.efi
- x64/Apps/timezone.efi
- x64/Shell.efi
-
-
- EFI_SPECIFICATION_VERSION 0x00020000
- EDK_RELEASE_VERSION 0x00020000
-
-
diff --git a/EdkShellBinPkg/EdkShellBinPkg.spd b/EdkShellBinPkg/EdkShellBinPkg.spd
deleted file mode 100644
index 287a1c38a2..0000000000
--- a/EdkShellBinPkg/EdkShellBinPkg.spd
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
- EdkShellBinPkg
- d4266a1b-1d38-4116-93ae-60dc3e2012a6
- 0.3
- Reference package showing multiple binaries
- This package contains multiple binary shell applications that follow UEFI specification. Now there are three binary shell modules, which are for bin (original module), normal shell and full shell.
- Copyright (c) 2006 - 2007, Intel Corporation.
- 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.
- FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
-
-
- true
- false
-
-
- bin/Shell.msa
- FullShell/FullShell.msa
- MinimumShell/MinimumShell.msa
-
-
\ No newline at end of file
diff --git a/EdkShellBinPkg/FullShell/FullShell.msa b/EdkShellBinPkg/FullShell/FullShell.msa
deleted file mode 100644
index 7cd4e26cd9..0000000000
--- a/EdkShellBinPkg/FullShell/FullShell.msa
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
- FullShell
- UEFI_APPLICATION
- c57ad6b7-0515-40a8-9d21-551652854e37
- 1.1
- Component description file for EFI Shell module.
- 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.
- Copyright (c) 2006, Intel Corporation.
- 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.
- FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
-
-
- IA32 X64 IPF
- true
- FullShell
-
-
- ia32/Shell_Full.efi
- ipf/Shell_Full.efi
- x64/Shell_full.efi
-
-
- EFI_SPECIFICATION_VERSION 0x00020000
- EDK_RELEASE_VERSION 0x00020000
-
-
\ No newline at end of file
diff --git a/EdkShellBinPkg/MinimumShell/MinimumShell.msa b/EdkShellBinPkg/MinimumShell/MinimumShell.msa
deleted file mode 100644
index f5ca33bf67..0000000000
--- a/EdkShellBinPkg/MinimumShell/MinimumShell.msa
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
- MinimumShell
- UEFI_APPLICATION
- c57ad6b7-0515-40a8-9d21-551652854e37
- 1.2
- Component description file for EFI Shell module.
- 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.
- Copyright (c) 2006, Intel Corporation.
- 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.
- FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
-
-
- IA32 X64 IPF
- true
- MinimumShell
-
-
- ia32/Apps/Attrib.efi
- ia32/Apps/Cls.efi
- ia32/Apps/Cp.efi
- ia32/Apps/Date.efi
- ia32/Apps/Dblk.efi
- ia32/Apps/Devices.efi
- ia32/Apps/Devtree.efi
- ia32/Apps/Drivers.efi
- ia32/Apps/Drvcfg.efi
- ia32/Apps/Drvdiag.efi
- ia32/Apps/Guid.efi
- ia32/Apps/IpConfig.efi
- ia32/Apps/Load.efi
- ia32/Apps/LoadPciRom.efi
- ia32/Apps/Ls.efi
- ia32/Apps/Mkdir.efi
- ia32/Apps/Mount.efi
- ia32/Apps/Mv.efi
- ia32/Apps/NShell.efi
- ia32/Apps/Openinfo.efi
- ia32/Apps/Resets.efi
- ia32/Apps/Rm.efi
- ia32/Apps/SmbiosView.efi
- ia32/Apps/TelnetMgmt.efi
- ia32/Apps/Time.efi
- ia32/Apps/Touch.efi
- ia32/Apps/Type.efi
- ia32/Apps/Unload.efi
- ia32/Apps/Ver.efi
- ia32/Apps/Vol.efi
- ia32/Apps/comp.efi
- ia32/Apps/dmem.efi
- ia32/Apps/dmpstore.efi
- ia32/Apps/edit.efi
- ia32/Apps/eficompress.efi
- ia32/Apps/efidecompress.efi
- ia32/Apps/err.efi
- ia32/Apps/hexedit.efi
- ia32/Apps/legacyboot.efi
- ia32/Apps/loadfv.efi
- ia32/Apps/mem.efi
- ia32/Apps/memmap.efi
- ia32/Apps/mm.efi
- ia32/Apps/mode.efi
- ia32/Apps/pci.efi
- ia32/Apps/sermode.efi
- ia32/Apps/stall.efi
- ia32/Apps/timezone.efi
- ia32/Shell.efi
- ipf/Apps/Attrib.efi
- ipf/Apps/Cls.efi
- ipf/Apps/Cp.efi
- ipf/Apps/Date.efi
- ipf/Apps/Dblk.efi
- ipf/Apps/Devices.efi
- ipf/Apps/Devtree.efi
- ipf/Apps/Drivers.efi
- ipf/Apps/Drvcfg.efi
- ipf/Apps/Drvdiag.efi
- ipf/Apps/Guid.efi
- ipf/Apps/IpConfig.efi
- ipf/Apps/Load.efi
- ipf/Apps/LoadPciRom.efi
- ipf/Apps/Ls.efi
- ipf/Apps/Mkdir.efi
- ipf/Apps/Mount.efi
- ipf/Apps/Mv.efi
- ipf/Apps/NShell.efi
- ipf/Apps/Openinfo.efi
- ipf/Apps/Resets.efi
- ipf/Apps/Rm.efi
- ipf/Apps/SmbiosView.efi
- ipf/Apps/TelnetMgmt.efi
- ipf/Apps/Time.efi
- ipf/Apps/Touch.efi
- ipf/Apps/Type.efi
- ipf/Apps/Unload.efi
- ipf/Apps/Ver.efi
- ipf/Apps/Vol.efi
- ipf/Apps/comp.efi
- ipf/Apps/dmem.efi
- ipf/Apps/dmpstore.efi
- ipf/Apps/edit.efi
- ipf/Apps/eficompress.efi
- ipf/Apps/efidecompress.efi
- ipf/Apps/err.efi
- ipf/Apps/hexedit.efi
- ipf/Apps/mem.efi
- ipf/Apps/memmap.efi
- ipf/Apps/mm.efi
- ipf/Apps/mode.efi
- ipf/Apps/pci.efi
- ipf/Apps/sermode.efi
- ipf/Apps/stall.efi
- ipf/Apps/timezone.efi
- ipf/Shell.efi
- x64/Apps/Attrib.efi
- x64/Apps/Cls.efi
- x64/Apps/Cp.efi
- x64/Apps/Date.efi
- x64/Apps/Dblk.efi
- x64/Apps/Devices.efi
- x64/Apps/Devtree.efi
- x64/Apps/Drivers.efi
- x64/Apps/Drvcfg.efi
- x64/Apps/Drvdiag.efi
- x64/Apps/Guid.efi
- x64/Apps/IpConfig.efi
- x64/Apps/Load.efi
- x64/Apps/LoadPciRom.efi
- x64/Apps/Ls.efi
- x64/Apps/Mkdir.efi
- x64/Apps/Mount.efi
- x64/Apps/Mv.efi
- x64/Apps/NShell.efi
- x64/Apps/Openinfo.efi
- x64/Apps/Resets.efi
- x64/Apps/Rm.efi
- x64/Apps/SmbiosView.efi
- x64/Apps/TelnetMgmt.efi
- x64/Apps/Time.efi
- x64/Apps/Touch.efi
- x64/Apps/Type.efi
- x64/Apps/Unload.efi
- x64/Apps/Ver.efi
- x64/Apps/Vol.efi
- x64/Apps/comp.efi
- x64/Apps/dmem.efi
- x64/Apps/dmpstore.efi
- x64/Apps/edit.efi
- x64/Apps/eficompress.efi
- x64/Apps/efidecompress.efi
- x64/Apps/err.efi
- x64/Apps/hexedit.efi
- x64/Apps/LegacyBoot.efi
- x64/Apps/LoadFv.efi
- x64/Apps/mem.efi
- x64/Apps/memmap.efi
- x64/Apps/mm.efi
- x64/Apps/mode.efi
- x64/Apps/pci.efi
- x64/Apps/sermode.efi
- x64/Apps/stall.efi
- x64/Apps/timezone.efi
- x64/Shell.efi
-
-
- EFI_SPECIFICATION_VERSION 0x00020000
- EDK_RELEASE_VERSION 0x00020000
-
-
\ No newline at end of file
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 8d179d5eef..0000000000
--- a/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-