remove the unused msa files in MdeModulePkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5726 6f19259b-4bc3-4df7-8a09-765794883524
author: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> 2008-08-25 05:03:29 +0000
committer: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> 2008-08-25 05:03:29 +0000
commit: e87298818044a116c8b5a805d2c2ae27a4ae2029 (patch)
tree: 72dba59d54adf086771d0ed43dfb13ae8c221c2a
parent: 14bcde689e3e352cbeebbd98d6e5d97a5178acc7 (diff)
download: edk2-e87298818044a116c8b5a805d2c2ae27a4ae2029.tar.gz
edk2-e87298818044a116c8b5a805d2c2ae27a4ae2029.tar.bz2
edk2-e87298818044a116c8b5a805d2c2ae27a4ae2029.zip
67 files changed, 0 insertions, 6031 deletions
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.msa b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.msa
deleted file mode 100644
index afb7ee2993..0000000000
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.msa
+++ /dev/null
@@ -1,81 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>EhciDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>BDFE430E-8F2A-4db0-9991-6F856594777E</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module Ehci</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>EhciDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Ehci.c</Filename>
-    <Filename>EhciSched.h</Filename>
-    <Filename>Ehci.h</Filename>
-    <Filename>EhciUrb.h</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>EhciDebug.h</Filename>
-    <Filename>EhciReg.c</Filename>
-    <Filename>EhciDebug.c</Filename>
-    <Filename>EhciSched.c</Filename>
-    <Filename>UsbHcMem.c</Filename>
-    <Filename>EhciReg.h</Filename>
-    <Filename>EhciUrb.c</Filename>
-    <Filename>UsbHcMem.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUsb2HcProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>EhcDriverEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.msa b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.msa
deleted file mode 100644
index 5787d2de4d..0000000000
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.msa
+++ /dev/null
@@ -1,84 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UhciDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>2FB92EFA-2EE0-4bae-9EB6-7464125E1EF7</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module Uhci</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UhciDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ComponentName.c</Filename>
-    <Filename>uhci.h</Filename>
-    <Filename>UhciSched.h</Filename>
-    <Filename>UhciReg.h</Filename>
-    <Filename>uhci.c</Filename>
-    <Filename>UhciQueue.h</Filename>
-    <Filename>UsbHcMem.c</Filename>
-    <Filename>UhciReg.c</Filename>
-    <Filename>UhciQueue.c</Filename>
-    <Filename>UhciDebug.h</Filename>
-    <Filename>UsbHcMem.h</Filename>
-    <Filename>UhciDebug.c</Filename>
-    <Filename>UhciSched.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUsb2HcProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUsbHcProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>UhciDriverEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi.msa b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi.msa
deleted file mode 100644
index b9c7b28ffa..0000000000
--- a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi.msa
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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>Undi</ModuleName>
-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>
-    <GuidValue>A1f436EA-A127-4EF8-957C-8048606FF670</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Undi module.</Abstract>
-    <Description>This module provides support for Universal Network Driver Interface</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Undi</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Init.c</Filename>
-    <Filename>Decode.c</Filename>
-    <Filename>E100b.c</Filename>
-    <Filename>E100b.h</Filename>
-    <Filename>Undi32.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid_31</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Events>
-    <CreateEvents>
-      <EventTypes EventGuidCName="gEfiEventVirtualAddressChangeGuid" Usage="ALWAYS_CONSUMED">
-        <EventType>EVENT_GROUP_GUID</EventType>
-      </EventTypes>
-      <EventTypes EventGuidCName="gEfiEventExitBootServicesGuid" Usage="ALWAYS_CONSUMED">
-        <EventType>EVENT_GROUP_GUID</EventType>
-      </EventTypes>
-    </CreateEvents>
-  </Events>
-  <SystemTables>
-    <SystemTableCNames Usage="SOMETIMES_PRODUCED">
-      <SystemTableCName>gEfiNetworkInterfaceIdentifierProtocolGuid_31</SystemTableCName>
-    </SystemTableCNames>
-  </SystemTables>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeUNDIDriver</ModuleEntryPoint>
-    </Extern>
-    <Extern>
-      <DriverBinding>gUndiDriverBinding</DriverBinding>
-    </Extern>
-    <Extern>
-      <SetVirtualAddressMapCallBack>UndiNotifyVirtual</SetVirtualAddressMapCallBack>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.msa b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.msa
deleted file mode 100644
index 4dba8273b8..0000000000
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.msa
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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>ScsiBus</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>0167CCC4-D0F7-4f21-A3EF-9E64B7CDCE8B</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Scsi Bus module.</Abstract>
-    <Description>SCSI bus driver. This driver scans all SCSI devices and export SCSI IO protocol</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>ScsiBus</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>EdkScsiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ScsiBus.h</Filename>
-    <Filename>ScsiBus.c</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiScsiPassThruProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiScsiIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00010010</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gSCSIBusDriverBinding</DriverBinding>
-      <ComponentName>gScsiBusComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.msa b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.msa
deleted file mode 100644
index eb722a2116..0000000000
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.msa
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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>ScsiDisk</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>0A66E322-3740-4cce-AD62-BD172CECCA35</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Scsi Disk module.Revision History</Abstract>
-    <Description>Scsi Disk driver. This driver detected the Scsi disk media and export block io protocol</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>ScsiDisk</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>EdkScsiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ScsiDisk.h</Filename>
-    <Filename>ScsiDisk.c</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiScsiIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00010010</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gScsiDiskDriverBinding</DriverBinding>
-      <ComponentName>gScsiDiskComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.msa b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.msa
deleted file mode 100644
index 838e4a13f3..0000000000
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.msa
+++ /dev/null
@@ -1,85 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UsbBusDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>240612B7-A063-11d4-9A3A-0090273FC14D</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module UsbBus</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UsbBusDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>usbbus.h</Filename>
-    <Filename>UsbDesc.h</Filename>
-    <Filename>UsbUtility.c</Filename>
-    <Filename>UsbHub.h</Filename>
-    <Filename>UsbUtility.h</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>UsbHub.c</Filename>
-    <Filename>usbbus.c</Filename>
-    <Filename>UsbEnumer.h</Filename>
-    <Filename>UsbEnumer.c</Filename>
-    <Filename>UsbDesc.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUsbHcProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUsb2HcProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUsbIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>UsbBusDriverEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.msa b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.msa
deleted file mode 100644
index fd4e82e862..0000000000
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.msa
+++ /dev/null
@@ -1,84 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UsbKbDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>2D2E62CF-9ECF-43b7-8219-94E7FC713DFE</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module UsbKb</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UsbKbDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>keyboard.h</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>keyboard.c</Filename>
-    <Filename>efikey.h</Filename>
-    <Filename>efikey.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUsbIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiHotPlugDeviceGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>USBKeyboardDriverBindingEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.msa b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.msa
deleted file mode 100644
index 92ab838f52..0000000000
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.msa
+++ /dev/null
@@ -1,75 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UsbMassStorageDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>9FB4B4A7-42C0-4bcd-8540-9BCC6711F83E</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module UsbMassStorage</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UsbMassStorageDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>UsbMassCbi.c</Filename>
-    <Filename>UsbMass.h</Filename>
-    <Filename>UsbMassCbi.h</Filename>
-    <Filename>UsbMassBoot.c</Filename>
-    <Filename>UsbMassImpl.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>UsbMassBot.c</Filename>
-    <Filename>UsbMassBot.h</Filename>
-    <Filename>UsbMassImpl.h</Filename>
-    <Filename>UsbMassBoot.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUsbIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>USBMassStorageEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.msa b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.msa
deleted file mode 100644
index 5ab61542b0..0000000000
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.msa
+++ /dev/null
@@ -1,73 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UsbMouseAbsolutePointerDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>4EA43463-747C-46eb-97FB-B0E5C5F05306</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module UsbMouseAbsolutePointer</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UsbMouseAbsolutePointerDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>UsbMouseAbsolutePointer.h</Filename>
-    <Filename>mousehid.c</Filename>
-    <Filename>UsbMouseAbsolutePointer.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>mousehid.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageGuid="2759ded5-bb57-4b06-af4f-c398fa552719"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiAbsolutePointerProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUsbIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>USBMouseAbsolutePointerDriverBindingEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.msa b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.msa
deleted file mode 100644
index 544e212f88..0000000000
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.msa
+++ /dev/null
@@ -1,73 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UsbMouseDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>2D2E62AA-9ECF-43b7-8219-94E7FC713DFE</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module UsbMouse</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UsbMouseDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>usbmouse.h</Filename>
-    <Filename>mousehid.c</Filename>
-    <Filename>usbmouse.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>mousehid.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimplePointerProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUsbIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>USBMouseDriverBindingEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.msa b/MdeModulePkg/Core/Dxe/DxeMain.msa
deleted file mode 100644
index 1ed9c09df1..0000000000
--- a/MdeModulePkg/Core/Dxe/DxeMain.msa
+++ /dev/null
@@ -1,243 +0,0 @@
-<?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>DxeMain</ModuleName>
-    <ModuleType>DXE_CORE</ModuleType>
-    <GuidValue>D6A2CB7F-6A18-4e2f-B43B-9920A733700A</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for DxeMain module.</Abstract>
-    <Description>This module provide an DXE CIS compliant implementation of DXE Core.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeMain</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DxeCoreEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PerformanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDecompressLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>TianoDecompressLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>CustomDecompressLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>EdkPeCoffLoaderLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>CacheMaintenanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DxeMain/DxeMain.c</Filename>
-    <Filename>DxeMain/DxeProtocolNotify.c</Filename>
-    <Filename>Dispatcher/Dispatcher.c</Filename>
-    <Filename>Dispatcher/dependency.c</Filename>
-    <Filename>Event/execdata.c</Filename>
-    <Filename>Event/event.c</Filename>
-    <Filename>Event/timer.c</Filename>
-    <Filename>Event/tpl.c</Filename>
-    <Filename>FwVol/FwVol.c</Filename>
-    <Filename>FwVol/Ffs.c</Filename>
-    <Filename>FwVol/FwVolAttrib.c</Filename>
-    <Filename>FwVol/FwVolRead.c</Filename>
-    <Filename>FwVol/FwVolWrite.c</Filename>
-    <Filename>FwVolBlock/FwVolBlock.c</Filename>
-    <Filename>Mem/memdata.c</Filename>
-    <Filename>Mem/Page.c</Filename>
-    <Filename>Mem/pool.c</Filename>
-    <Filename>Gcd/gcd.c</Filename>
-    <Filename>Hand/handle.c</Filename>
-    <Filename>Hand/locate.c</Filename>
-    <Filename>Hand/Notify.c</Filename>
-    <Filename>Hand/DriverSupport.c</Filename>
-    <Filename>Library/Library.c</Filename>
-    <Filename>Misc/InstallConfigurationTable.c</Filename>
-    <Filename>Misc/SetWatchdogTimer.c</Filename>
-    <Filename>Misc/Stall.c</Filename>
-    <Filename>Misc/DebugImageInfo.c</Filename>
-    <Filename>Image/Image.c</Filename>
-    <Filename>Image/ImageFile.c</Filename>
-    <Filename>SectionExtraction/CoreSectionExtraction.c</Filename>
-    <Filename>DebugImageInfo.h</Filename>
-    <Filename>DxeMain.h</Filename>
-    <Filename>Exec.h</Filename>
-    <Filename>FwVolBlock.h</Filename>
-    <Filename>FwVolDriver.h</Filename>
-    <Filename>gcd.h</Filename>
-    <Filename>hand.h</Filename>
-    <Filename>Image.h</Filename>
-    <Filename>imem.h</Filename>
-    <Filename>Library.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>gEfiEbcProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiFirmwareVolumeDispatchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiSectionExtractionProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPlatformDriverOverrideProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiBusSpecificDriverOverrideProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiTimerArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiMetronomeArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiMonotonicCounterArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiBdsArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSecurityArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiWatchdogTimerArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiRealTimeClockArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiResetArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiLoadPeImageProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiCustomizedDecompressProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiTianoDecompressProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiCapsuleArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiMemoryTypeInformationGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiDxeServicesTableGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiHobListGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiDebugImageInfoTableGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gAprioriGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiFirmwareFileSystemGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiFileInfoGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiHobMemoryAllocModuleGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiEventExitBootServicesGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiEventVirtualAddressChangeGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiEventMemoryMapChangeGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiEventReadyToBootGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiEventLegacyBootGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>DxeMain</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.msa b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.msa
deleted file mode 100644
index c552966169..0000000000
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.msa
+++ /dev/null
@@ -1,168 +0,0 @@
-<?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>DxeIpl</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>86D70125-BAA3-4296-A62F-602BEBBB9081</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for DxeIpl module</Abstract>
-    <Description>The responsibility of this module is to load the DXE Core from a Firmware Volume.  This implementation i used to load a 32-bit DXE Core.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeIpl</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeimEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>CacheMaintenanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>EdkPeCoffLoaderLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDecompressLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>TianoDecompressLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>CustomDecompressLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeCoffLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DxeLoad.c</Filename>
-    <Filename>DxeIpl.h</Filename>
-    <Filename>DxeIpl.dxs</Filename>
-    <Filename SupArchList="IA32 X64 EBC">Ia32/ImageRead.c</Filename>
-    <Filename SupArchList="IA32">Ia32/DxeLoadFunc.c</Filename>
-    <Filename SupArchList="IA32">Ia32/VirtualMemory.c</Filename>
-    <Filename SupArchList="IA32">Ia32/VirtualMemory.h</Filename>
-    <Filename SupArchList="X64 EBC">X64/DxeLoadFunc.c</Filename>
-    <Filename SupArchList="IPF">Ipf/ImageRead.c</Filename>
-    <Filename SupArchList="IPF">Ipf/DxeLoadFunc.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="SOMETIMES_PRODUCED">
-      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="SOMETIMES_PRODUCED">
-      <ProtocolCName>gEfiTianoDecompressProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="SOMETIMES_PRODUCED">
-      <ProtocolCName>gEfiCustomizedDecompressProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <PPIs>
-    <Ppi Usage="SOMETIMES_PRODUCED">
-      <PpiCName>gEfiDxeIplPpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="SOMETIMES_PRODUCED">
-      <PpiCName>gEfiPeiFvFileLoaderPpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="SOMETIMES_PRODUCED">
-      <PpiCName>gEfiEndOfPeiSignalPpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>gEfiPeiRecoveryModulePpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>gEfiPeiS3ResumePpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>gEfiPeiSectionExtractionPpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>gEfiPeiSecurityPpiGuid</PpiCName>
-    </Ppi>
-  </PPIs>
-  <Guids>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiPeiPeCoffLoaderGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PeimInitializeDxeIpl</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED" SupArchList="IA32">
-      <C_Name>PcdDxeIplSwitchToLongMode</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>If this feature is enabled, then the DXE IPL will load a 64-bit DxeCore.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdDxeIplBuildShareCodeHobs</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>If this feature is enabled, DXE IPL will build a series of HOBs to share code with DXE Core.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdDxeIplSupportEfiDecompress</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>If this feature is enabled, then the DXE IPL must support decompressing files compressed with the EFI Compression algorithm</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdDxeIplSupportTianoDecompress</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>If this feature is enabled, then the DXE IPL must support decompressing files compressed with the Tiano Compression algorithm</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdDxeIplSupportCustomDecompress</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>If this feature is enabled, then the DXE IPL must support decompressing files compressed with the Custom Compression algorithm</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Core/Pei/PeiMain.msa b/MdeModulePkg/Core/Pei/PeiMain.msa
deleted file mode 100644
index 31ebc45621..0000000000
--- a/MdeModulePkg/Core/Pei/PeiMain.msa
+++ /dev/null
@@ -1,112 +0,0 @@
-<?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>PeiMain</ModuleName>
-    <ModuleType>PEI_CORE</ModuleType>
-    <GuidValue>52C05B14-0B98-496c-BC3B-04B50211D680</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for PeiMain module</Abstract>
-    <Description>This module provide an DXE CIS compliant implementation.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiMain</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiCoreEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PerformanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeCoffGetEntryPointLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>TimerLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PeiMain.h</Filename>
-    <Filename>BootMode/BootMode.c</Filename>
-    <Filename>Dependency/dependency.h</Filename>
-    <Filename>Dependency/dependency.c</Filename>
-    <Filename>Dispatcher/Dispatcher.c</Filename>
-    <Filename>FwVol/FwVol.c</Filename>
-    <Filename>Hob/Hob.c</Filename>
-    <Filename>Image/Image.c</Filename>
-    <Filename>Memory/MemoryServices.c</Filename>
-    <Filename>PeiMain/PeiMain.c</Filename>
-    <Filename>Ppi/Ppi.c</Filename>
-    <Filename>Reset/Reset.c</Filename>
-    <Filename>Security/Security.c</Filename>
-    <Filename>StatusCode/StatusCode.c</Filename>
-    <Filename SupArchList="IPF">Ipf/SwitchToCacheMode.c</Filename>
-    <Filename SupArchList="IPF">Ipf/IpfCpuCore.i</Filename>
-    <Filename SupArchList="IPF">Ipf/IpfCpuCore.s</Filename>
-    <Filename SupArchList="IPF">Ipf/IpfPeiMain.h</Filename>
-    <Filename SupArchList="IPF">Ipf/Stack.c</Filename>
-    <Filename SupArchList="IA32 X64 EBC">Dispatcher/Stack.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <PPIs>
-    <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>gEfiPeiMemoryDiscoveredPpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>gEfiFindFvPpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>gEfiPeiFvFileLoaderPpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>gEfiDxeIplPpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>gEfiPeiResetPpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>gEfiPeiStatusCodePpiGuid</PpiCName>
-    </Ppi>
-    <PpiNotify Usage="SOMETIMES_CONSUMED">
-      <PpiNotifyCName>gEfiPeiSecurityPpiGuid</PpiNotifyCName>
-    </PpiNotify>
-  </PPIs>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PeiCore</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.msa b/MdeModulePkg/Core/RuntimeDxe/Runtime.msa
deleted file mode 100644
index 207b44c4d9..0000000000
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.msa
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>Runtime</ModuleName>
-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>
-    <GuidValue>B601F8C4-43B7-4784-95B1-F4226CB40CEE</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Runtime module.</Abstract>
-    <Description>This module is used to produce the EFI runtime virtual switch over services.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Runtime</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>CacheMaintenanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeCoffLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Runtime.dxs</Filename>
-    <Filename>Runtime.c</Filename>
-    <Filename>Runtime.h</Filename>
-    <Filename>Crc32.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <SystemTables>
-    <SystemTableCNames Usage="SOMETIMES_CONSUMED">
-      <SystemTableCName>gEfiUgaIoProtocolGuid</SystemTableCName>
-    </SystemTableCNames>
-    <SystemTableCNames Usage="SOMETIMES_CONSUMED">
-      <SystemTableCName>gEfiCapsuleGuid</SystemTableCName>
-    </SystemTableCNames>
-  </SystemTables>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>RuntimeDriverInitialize</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa
deleted file mode 100644
index 444867af86..0000000000
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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>DxeCorePerformanceLib</ModuleName>
-    <ModuleType>DXE_CORE</ModuleType>
-    <GuidValue>D0F78BBF-0A30-4c63-8A48-0F618A4AFACD</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for DxeCore Performance Library</Abstract>
-    <Description>This library provides intrastructure for DxeCore to log performance.</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeCorePerformanceLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>PerformanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>TimerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DxeCorePerformanceLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gPerformanceProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gPeiPerformanceHobGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <Constructor>DxeCorePerformanceLibConstructor</Constructor>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of
-                Performance Measurement.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdMaxPeiPerformanceLogEntries</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>Maximun number of performance log entries during PEI phase.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa
deleted file mode 100644
index 3555a24da0..0000000000
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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>DxePerformanceLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>8B8B4CCC-65FC-41a5-8067-308B8E42CCF2</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Dxe Performance Library</Abstract>
-    <Description>This library provides intrastructure for Dxe driver to log performance.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxePerformanceLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>PerformanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DxePerformanceLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gPerformanceProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of
-                Performance Measurement.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Library/DxePlatDriOverLib/DxePlatDriOverLib.msa b/MdeModulePkg/Library/DxePlatDriOverLib/DxePlatDriOverLib.msa
deleted file mode 100644
index f01088e875..0000000000
--- a/MdeModulePkg/Library/DxePlatDriOverLib/DxePlatDriOverLib.msa
+++ /dev/null
@@ -1,94 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PlatDriOverLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>8bd8d711-2736-46d7-8c81-5de68e0a9e88</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module PlatDriOverLib</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation. All rights reserved.</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PlatDriOverLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PlatDriOverLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DxeServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PlatDriOverLib.c</Filename>
-    <Filename>PlatDriOver.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiBusSpecificDriverOverrideProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPlatformDriverOverrideProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiFirmwareVolume2ProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa b/MdeModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa
deleted file mode 100644
index d302a8bae6..0000000000
--- a/MdeModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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>EdkDxePrintLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>50bcb105-6634-441d-b403-659110a03ad2</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>DXE Print library</Abstract>
-    <Description>Print Library based on EFI_PRINT_PROTOCOL</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>EdkDxePrintLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PrintLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPrintProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa b/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
deleted file mode 100644
index 2aa7abb34d..0000000000
--- a/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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>EdkFvbServiceLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>bd4d540e-04b0-4b10-8fd5-4a7bb533cf67</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>FvbService Library for UEFI drivers</Abstract>
-    <Description>This library instance provide sevice functions to access Firmware Volume Block protocol.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>false</BinaryModule>
-    <OutputFileBasename>EdkFvbServiceLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>EdkFvbServiceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <Keyword>UefiRuntimeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
-      <Keyword>EdkDxeSalLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Fvb.h</Filename>
-    <Filename SupArchList="IA32">Ia32/Fvb.c</Filename>
-    <Filename SupArchList="X64">x64/Fvb.c</Filename>
-    <Filename SupArchList="IPF">Ipf/Fvb.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>
-    </Protocol>
-    <ProtocolNotify Usage="SOMETIMES_CONSUMED">
-      <ProtocolNotifyCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolNotifyCName>
-    </ProtocolNotify>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <Constructor>FvbLibInitialize</Constructor>
-    </Extern>
-    <Extern>
-      <SetVirtualAddressMapCallBack>FvbVirtualAddressChangeNotifyEvent</SetVirtualAddressMapCallBack>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.msa b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.msa
deleted file mode 100644
index feedd2103e..0000000000
--- a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.msa
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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>HiiLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>3143687A-7C80-404e-B5FE-2D88980E1B1C</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Library instance for HII common routines.</Abstract>
-    <Description>This library instance implements the common HII routines.</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>HiiLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>HiiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>HiiLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.msa b/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.msa
deleted file mode 100644
index dc9d665a14..0000000000
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.msa
+++ /dev/null
@@ -1,74 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiEfiIfrSupportLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>bf38668e-e231-4baa-99e4-8c0e4c35dca6</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module UefiEfiIfrSupportLib</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation. All rights reserved.</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiEfiIfrSupportLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>R8Lib.c</Filename>
-    <Filename>R8Lib.h</Filename>
-    <Filename>UefiIfrString.c</Filename>
-    <Filename>UefiIfrOpCodeCreation.c</Filename>
-    <Filename>UefiIfrLibraryInternal.h</Filename>
-    <Filename>UefiIfrForm.c</Filename>
-    <Filename>UefiIfrCommon.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Library/GenericBdsLib/GenericBdsLib.msa b/MdeModulePkg/Library/GenericBdsLib/GenericBdsLib.msa
deleted file mode 100644
index 076d7b91dc..0000000000
--- a/MdeModulePkg/Library/GenericBdsLib/GenericBdsLib.msa
+++ /dev/null
@@ -1,159 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>GenericBdsLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>e405ec31-ccaa-4dd4-83e8-0aec01703f7e</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module GenericBdsLib</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation. All rights reserved.</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>GenericBdsLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DxeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename SupArchList="IPF">Ipf\BmMachine.h</Filename>
-    <Filename>R8Lib.h</Filename>
-    <Filename SupArchList="X64">x64\BmMachine.h</Filename>
-    <Filename>BdsLib.h</Filename>
-    <Filename>BdsBoot.c</Filename>
-    <Filename SupArchList="IA32">Ia32\BmMachine.h</Filename>
-    <Filename SupArchList="X64">x64\ClearDr.asm</Filename>
-    <Filename SupArchList="EBC">Ebc\BmMachine.h</Filename>
-    <Filename>BdsConsole.c</Filename>
-    <Filename>R8Lib.c</Filename>
-    <Filename SupArchList="IA32">Ia32\ClearDr.asm</Filename>
-    <Filename>BdsMisc.c</Filename>
-    <Filename>BdsConnect.c</Filename>
-    <Filename>Performance.c</Filename>
-    <Filename>DevicePath.c</Filename>
-    <Filename SupArchList="IPF">Ipf\ShadowRom.c</Filename>
-    <Filename>Performance.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiLegacyBiosProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDebugPortProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiFormBrowserProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathToTextProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiPcAnsiGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiFileInfoGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiVT100Guid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiShellFileGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiHobListGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiVTUTF8Guid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiMemoryTypeInformationGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiVT100PlusGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Library/GraphicsLib/GraphicsLib.msa b/MdeModulePkg/Library/GraphicsLib/GraphicsLib.msa
deleted file mode 100644
index 2007ba062e..0000000000
--- a/MdeModulePkg/Library/GraphicsLib/GraphicsLib.msa
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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>EdkGraphicsLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>08c1a0e4-1208-47f8-a2c5-f42eabee653a</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Graphics Library for UEFI drivers</Abstract>
-    <Description>This library provides supports for basic graphic functions.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>EdkGraphicsLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>EdkGraphicsLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Graphics.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiOEMBadgingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiGraphicsOutputProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.msa b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.msa
deleted file mode 100644
index 85ce0ad520..0000000000
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.msa
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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>PeiPerformanceLib</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>F72DE735-B24F-4ef6-897F-70A85D01A047</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Memory-only library functions with no library constructor/destructor</Abstract>
-    <Description>This module provides the performance measurement interfaces in PEI phase, it is one instance of Performance Libarary.</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiPerformanceLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM PEI_CORE">
-      <Keyword>PerformanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>TimerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PeiPerformanceLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Guids>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gPeiPerformanceHobGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of
-                Performance Measurement.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdMaxPeiPerformanceLogEntries</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>Maximun number of performance log entries during PEI phase.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Logo/Logo.msa b/MdeModulePkg/Logo/Logo.msa
deleted file mode 100644
index 35923df62d..0000000000
--- a/MdeModulePkg/Logo/Logo.msa
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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>Logo</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>7BB28B99-61BB-11D5-9A5D-0090273FC14D</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for creating a Logo file.</Abstract>
-    <Description>
-      This module provides the default logo bitmap picture 
-      shown on setup screen, which is correspondig to gEfiDefaultBmpLogoGuid.
-    </Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>true</BinaryModule>
-    <OutputFileBasename>Logo</OutputFileBasename>
-  </ModuleDefinitions>
-  <SourceFiles>
-    <Filename>Logo.bmp</Filename>
-  </SourceFiles>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.msa b/MdeModulePkg/Universal/BdsDxe/BdsDxe.msa
deleted file mode 100644
index 25547558ae..0000000000
--- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.msa
+++ /dev/null
@@ -1,238 +0,0 @@
-<?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>BdsDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>FC5C7020-1A48-4198-9BE2-EAD5ABC8CF2F</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component discription file for Bds module</Abstract>
-    <Description>N/A</Description>
-    <Copyright>Copyright (c) 2008, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Bds</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>EfiShellLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>EdkGenericPlatformBdsLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>EdkGraphicsLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DxeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PerformanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>EdkGenericBdsLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>EdkIfrSupportLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>BdsEntry.c</Filename>
-    <Filename>FrontPage.c</Filename>
-    <Filename>FrontPageStrings.uni</Filename>
-    <Filename>FrontPageVfr.Vfr</Filename>
-    <Filename>Language.c</Filename>
-    <Filename>String.c</Filename>
-    <Filename>Strings.uni</Filename>
-    <Filename>Capsules.c</Filename>
-    <Filename>MemoryTest.c</Filename>
-    <Filename>Hotkey.c</Filename>
-    <Filename>BootMaint/Bmstring.uni</Filename>
-    <Filename>BootMaint/Bm.vfr</Filename>
-    <Filename>BootMaint/BmLib.c</Filename>
-    <Filename>BootMaint/BootOption.c</Filename>
-    <Filename>BootMaint/ConsoleOption.c</Filename>
-    <Filename>BootMaint/Data.c</Filename>
-    <Filename>BootMaint/Variable.c</Filename>
-    <Filename>BootMaint/UpdatePage.c</Filename>
-    <Filename>BootMaint/BBSsupport.c</Filename>
-    <Filename>BootMaint/BootMaint.c</Filename>
-    <Filename>BootMaint/FileExplorer.c</Filename>
-    <Filename>BootMaint/FE.vfr</Filename>
-    <Filename>BootMngr/BootManager.c</Filename>
-    <Filename>BootMngr/BootManagerStrings.uni</Filename>
-    <Filename>BootMngr/BootManagerVfr.Vfr</Filename>
-    <Filename>DeviceMngr/DeviceManager.c</Filename>
-    <Filename>DeviceMngr/DeviceManagerStrings.uni</Filename>
-    <Filename>DeviceMngr/DeviceManagerVfr.Vfr</Filename>
-    <Filename>Bds.dxs</Filename>
-    <Filename>DeviceMngr/DeviceManager.h</Filename>
-    <Filename>BootMaint/FormGuid.h</Filename>
-    <Filename>String.h</Filename>
-    <Filename>BootMaint/BootMaint.h</Filename>
-    <Filename>BootMngr/BootManager.h</Filename>
-    <Filename>BootMaint/BBSsupport.h</Filename>
-    <Filename>Hotkey.h</Filename>
-    <Filename>Bds.h</Filename>
-    <Filename>Language.h</Filename>
-    <Filename>FrontPage.h</Filename>
-    <Filename>EdkILib.c</Filename>
-  </SourceFiles>
-  <NonProcessedFiles>
-    <Filename>DeviceMngr/PlatOverMngr/PlatOverMngr.c</Filename>
-    <Filename>DeviceMngr/PlatOverMngr/PlatOverMngr.dxs</Filename>
-    <Filename>DeviceMngr/PlatOverMngr/PlatOverMngr.h</Filename>
-    <Filename>DeviceMngr/PlatOverMngr/Vfr.vfr</Filename>
-    <Filename>DeviceMngr/PlatOverMngr/VfrStrings.uni</Filename>
-    <Filename>DeviceMngr/SetOptions/GetInfo.c</Filename>
-    <Filename>DeviceMngr/SetOptions/GetInfo.h</Filename>
-    <Filename>DeviceMngr/SetOptions/SetOptions.c</Filename>
-    <Filename>DeviceMngr/SetOptions/SetOptions.h</Filename>
-    <Filename>DeviceMngr/SetOptions/Vfr.vfr</Filename>
-    <Filename>DeviceMngr/SetOptions/VfrStrings.uni</Filename>
-    <Filename>HwErrRecSupport.c</Filename>
-    <Filename>HwErrRecSupport.h</Filename>
-  </NonProcessedFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-    <Package PackageGuid="3bd11b88-bf8b-4d90-9e04-77c97e58bbdd"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiFormBrowser2ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiHiiConfigAccessProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiHiiConfigRoutingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleTextInputExProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiGraphicsOutputProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiHiiDatabaseProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiLegacyBiosProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiGenericMemTestProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiBdsArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiHiiStringProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiFlashMapHobGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gTerminalDriverGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiFileInfoGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiFileSystemVolumeLabelInfoIdGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiBootStateGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiHobListGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiGenericVariableGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>BdsInitialize</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.msa b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.msa
deleted file mode 100644
index 346cc7f32f..0000000000
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.msa
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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>CapsuleRuntime</ModuleName>
-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>
-    <GuidValue>42857F0A-13F2-4B21-8A23-53D3F714B840</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Capsule module.</Abstract>
-    <Description>CapsuleRuntime module provides capsule runtime services</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>CapsuleRuntime</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DxeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Capsule.c</Filename>
-    <Filename>CapsuleService.c</Filename>
-    <Filename>CapsuleService.h</Filename>
-    <Filename>Capsule.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageGuid="2759ded5-bb57-4b06-af4f-c398fa552719"/>
-    <Package PackageGuid="BA0D78D6-2CAF-414b-BD4D-B6762A894288"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiCapsuleArchProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiCapsuleVendorGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>CapsuleServiceInitialize</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdSupportUpdateCapsuleRest</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>Indicate whether platform can support update capsule across a system reset</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaxSizePopulateCapsule</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>Indicate the max size the platform can support in case of populated capsules</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaxSizeNonPopulateCapsule</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>Indicate the max size the platform can support in case of non-populated capsules</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.msa b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.msa
deleted file mode 100644
index a4300e53f3..0000000000
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.msa
+++ /dev/null
@@ -1,135 +0,0 @@
-<?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>ConPlatform</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>51ccf399-4fdf-4e55-a45b-e123f84d456a</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Console Platfrom Driver</Abstract>
-    <Description>Console Platfrom DXE Driver, install Console protocols</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>ConPlatform</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ConPlatform.c</Filename>
-    <Filename>ConPlatform.h</Filename>
-    <Filename>ComponentName.h</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiConsoleInDeviceGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiConsoleOutDeviceGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiStandardErrorDeviceGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiHotPlugDeviceGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Variables>
-    <Variable Usage="SOMETIMES_CONSUMED">
-      <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
-      <HelpText>L"ConInDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
-    </Variable>
-    <Variable Usage="SOMETIMES_CONSUMED">
-      <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E</VariableName>
-      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
-      <HelpText>L"ConIn" global variable will be updated if the serial device is not a hot plug device.</HelpText>
-    </Variable>
-    <Variable Usage="SOMETIMES_CONSUMED">
-      <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
-      <HelpText>L"ConOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
-    </Variable>
-    <Variable Usage="SOMETIMES_CONSUMED">
-      <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074</VariableName>
-      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
-      <HelpText>L"ConOut" global variable will be updated if the serial device is not a hot plug device.</HelpText>
-    </Variable>
-    <Variable Usage="SOMETIMES_CONSUMED">
-      <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
-      <HelpText>L"ErrOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
-    </Variable>
-    <Variable Usage="SOMETIMES_CONSUMED">
-      <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074</VariableName>
-      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
-      <HelpText>L"ErrOut" global variable will be updated if the serial device is not a hot plug device.</HelpText>
-    </Variable>
-  </Variables>
-  <Guids>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gConPlatformTextInDriverBinding</DriverBinding>
-      <ComponentName>gConPlatformComponentName</ComponentName>
-    </Extern>
-    <Extern>
-      <DriverBinding>gConPlatformTextOutDriverBinding</DriverBinding>
-      <ComponentName>gConPlatformComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.msa b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.msa
deleted file mode 100644
index afc35028ea..0000000000
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.msa
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>ConSplitter</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>408edcec-cf6d-477c-a5a8-b4844e3de281</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for ConSplitter module.</Abstract>
-    <Description>Any Handle that attatched EFI_CONSOLE_IDENTIFIER_PROTOCOL can be bound by this driver.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>ConSplitter</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ConSplitter.c</Filename>
-    <Filename>ConSplitter.h</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>ConSplitterGraphics.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
-      <HelpText>UGA Draw protocol is only installed in EFI mode.</HelpText>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiGraphicsOutputProtocolGuid</ProtocolCName>
-      <HelpText>Graphics Output Protocol is only installed in UEFI mode.</HelpText>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiSimplePointerProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_PRODUCED">
-      <GuidCName>gEfiPrimaryStandardErrorDeviceGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_PRODUCED">
-      <GuidCName>gEfiPrimaryConsoleInDeviceGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_PRODUCED">
-      <GuidCName>gEfiPrimaryConsoleOutDeviceGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiConsoleOutDeviceGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiStandardErrorDeviceGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiConsoleInDeviceGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>ConSplitterDriverEntry</ModuleEntryPoint>
-    </Extern>
-    <Extern>
-      <DriverBinding>gConSplitterConInDriverBinding</DriverBinding>
-      <ComponentName>gConSplitterConInComponentName</ComponentName>
-    </Extern>
-    <Extern>
-      <DriverBinding>gConSplitterSimplePointerDriverBinding</DriverBinding>
-      <ComponentName>gConSplitterSimplePointerComponentName</ComponentName>
-    </Extern>
-    <Extern>
-      <DriverBinding>gConSplitterConOutDriverBinding</DriverBinding>
-      <ComponentName>gConSplitterConOutComponentName</ComponentName>
-    </Extern>
-    <Extern>
-      <DriverBinding>gConSplitterStdErrDriverBinding</DriverBinding>
-      <ComponentName>gConSplitterStdErrComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.msa b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.msa
deleted file mode 100644
index 4276a2d042..0000000000
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.msa
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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>GraphicsConsole</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>CCCB0C28-4B24-11d5-9A5A-0090273FC14D</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for GraphicsConsole module</Abstract>
-    <Description>This is the main routine for initializing the Graphics Console support routines.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>GraphicsConsole</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HiiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>GraphicsConsole.h</Filename>
-    <Filename>GraphicsConsole.c</Filename>
-    <Filename>LaffStd.c</Filename>
-    <Filename>ComponentName.h</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiGraphicsOutputProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <HiiPackages>
-    <HiiPackage Usage="ALWAYS_PRODUCED">
-      <HiiCName>FontPack</HiiCName>
-      <HelpText>Register UsStdNarrow Fonts into the global database.</HelpText>
-    </HiiPackage>
-  </HiiPackages>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gGraphicsConsoleDriverBinding</DriverBinding>
-      <ComponentName>gGraphicsConsoleComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.msa b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.msa
deleted file mode 100644
index 1c1dc0680d..0000000000
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.msa
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>Terminal</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>9E863906-A40F-4875-977F-5B93FF237FC6</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Terminal module.</Abstract>
-    <Description>This driver installs Simple Text In/Out protocol for terminal devices (serial devices or hotplug devices).</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Terminal</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Terminal.h</Filename>
-    <Filename>Terminal.c</Filename>
-    <Filename>TerminalConIn.c</Filename>
-    <Filename>TerminalConOut.c</Filename>
-    <Filename>ansi.c</Filename>
-    <Filename>vtutf8.c</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>gEfiHotPlugDeviceGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Variables>
-    <Variable Usage="SOMETIMES_CONSUMED">
-      <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
-      <HelpText>L"ConInDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
-    </Variable>
-    <Variable Usage="SOMETIMES_CONSUMED">
-      <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
-      <HelpText>L"ConOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
-    </Variable>
-    <Variable Usage="SOMETIMES_CONSUMED">
-      <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
-      <HelpText>L"ErrOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
-    </Variable>
-  </Variables>
-  <Guids>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiPcAnsiGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiVT100PlusGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiVT100Guid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiVTUTF8Guid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gTerminalDriverBinding</DriverBinding>
-      <ComponentName>gTerminalComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.msa b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.msa
deleted file mode 100644
index 16743bc7b2..0000000000
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.msa
+++ /dev/null
@@ -1,100 +0,0 @@
-<?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>DebugPort</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>73E9457A-CEA1-4917-9A9C-9F1F0F0FD322</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for DebugPort module.</Abstract>
-    <Description>This driver binds exclusively to serial io on the controller handle,
-      and initializes serial Io interface, publishs DebugPort and device path Protocol.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DebugPort</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DebugPort.h</Filename>
-    <Filename>DebugPort.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>DebugPort.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiDebugPortProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiComponentNameProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Variables>
-    <Variable Usage="SOMETIMES_CONSUMED">
-      <VariableName>0x0044 0x0045 0x0042 0x0055 0x0047 0x0050 0x004F 0x0052 0x0054</VariableName>
-      <GuidC_Name>gEfiDebugPortProtocolGuid</GuidC_Name>
-      <HelpText>L"DEBUGPORT" variable is specified. gEfiDebugPortVariableGuid is
-       one virtual guid, which can't be described in this section.
-       So gEfiDebugPortProtocolGuid name is instead of it.</HelpText>
-    </Variable>
-  </Variables>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeDebugPortDriver</ModuleEntryPoint>
-    </Extern>
-    <Extern>
-      <ModuleUnloadImage>ImageUnloadHandler</ModuleUnloadImage>
-    </Extern>
-    <Extern>
-      <DriverBinding>gDebugPortDriverBinding</DriverBinding>
-      <ComponentName>gDebugPortComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.msa b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.msa
deleted file mode 100644
index 23ebaf401b..0000000000
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.msa
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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>DebugSupport</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>911D584C-35F7-4955-BEF9-B452769DDC3A</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for DebugSupport module.</Abstract>
-    <Description>This driver installs DebugSupport protocol for the selected processor.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>false</BinaryModule>
-    <OutputFileBasename>DebugSupport</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DebugSupport.c</Filename>
-    <Filename>DebugSupport.dxs</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/AsmFuncs.asm</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/AsmFuncs.S</Filename>
-    <Filename SupArchList="IA32">Ia32/plDebugSupport.h</Filename>
-    <Filename SupArchList="IA32">Ia32/plDebugSupport.c</Filename>
-    <Filename SupArchList="IPF">ipf/AsmFuncs.s</Filename>
-    <Filename SupArchList="IPF">ipf/common.i</Filename>
-    <Filename SupArchList="IPF">ipf/Ds64Macros.i</Filename>
-    <Filename SupArchList="IPF">ipf/plDebugSupport.c</Filename>
-    <Filename SupArchList="IPF">ipf/plDebugSupport.h</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">x64/AsmFuncs.asm</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">x64/AsmFuncs.S</Filename>
-    <Filename SupArchList="X64">x64/plDebugSupport.h</Filename>
-    <Filename SupArchList="X64">x64/plDebugSupport.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageGuid="BA0D78D6-2CAF-414b-BD4D-B6762A894288"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="SOMETIMES_PRODUCED">
-      <ProtocolCName>gEfiDebugSupportProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeDebugSupportDriver</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED" SupArchList="IA32">
-      <C_Name>PcdNtEmulatorEnable</C_Name>
-      <TokenSpaceGuidCName>gEfiMdeModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If this PCD is set as TRUE, NT emulator will be endabled.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.msa b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.msa
deleted file mode 100644
index bd082809e3..0000000000
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.msa
+++ /dev/null
@@ -1,117 +0,0 @@
-<?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>DevicePath</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>9B680FCE-AD6B-4F3A-B60B-F59899003443</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Device Path Driver.</Abstract>
-    <Description>This driver implement these three UEFI deveice path protocols (
-      DevicePathUtilities, DevicePahtToText and DevicePathFromText) and install them.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DevicePath</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3">
-      <Keyword>PrintLib</Keyword>
-      <HelpText>Recommended libary Instance is BasePrintLib instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0">
-      <Keyword>DevicePathLib</Keyword>
-      <HelpText>Recommended libary Instance is UefiDevicePathLib instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DevicePath.c</Filename>
-    <Filename>DevicePath.h</Filename>
-    <Filename>DevicePathFromText.c</Filename>
-    <Filename>DevicePathToText.c</Filename>
-    <Filename>DevicePathUtilities.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDebugPortProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiDevicePathUtilitiesProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiDevicePathFromTextProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiDevicePathToTextProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiPcAnsiGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiVT100PlusGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiVT100Guid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiVTUTF8Guid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
-    <Extern>
-      <ModuleEntryPoint>DevicePathEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_PRODUCED">
-      <C_Name>PcdDevicePathSupportDevicePathToText</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>If TRUE, then the Device Path To Text Protocol should be produced by the platform</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_PRODUCED">
-      <C_Name>PcdDevicePathSupportDevicePathFromText</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>If TRUE, then the Device Path From Text Protocol should be produced by the platform</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.msa b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.msa
deleted file mode 100644
index b6b096090d..0000000000
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.msa
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>DiskIoDxe</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>6B38F7B4-AD98-40e9-9093-ACA2B5A253C4</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for DiskIo module.</Abstract>
-    <Description>DiskIo driver that layers it's self on every Block IO protocol in the system.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DiskIoDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <FilenameDiskIo.c</Filename>
-    <Filename>DiskIo.h</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiDiskIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gDiskIoDriverBinding</DriverBinding>
-      <ComponentName>gDiskIoComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.msa b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.msa
deleted file mode 100644
index 35274f0f71..0000000000
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.msa
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>PartitionDxe</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>1FA1F39E-FEFF-4aae-BD7B-38A070A3B609</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Partition module.</Abstract>
-    <Description>Partition driver produces the logical BlockIo device
-      that represents the bytes Start to End of the Parent Block IO
-      device (one partition of physical BlockIo device,
-      which can be one of GPT, MBR, ElTorito partition).</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PartitionDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Partition.h</Filename>
-    <Filename>Partition.c</Filename>
-    <Filename>ElTorito.c</Filename>
-    <Filename>Gpt.c</Filename>
-    <Filename>Mbr.c</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDiskIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiPartTypeSystemPartGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiPartTypeUnusedGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gPartitionDriverBinding</DriverBinding>
-      <ComponentName>gPartitionComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.msa b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.msa
deleted file mode 100644
index d8ebf6d872..0000000000
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.msa
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>EnglishDxe</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>CD3BAFB6-50FB-4fe8-8E4E-AB74D2C1A600</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for English module for unicode collation.</Abstract>
-    <Description>This driver installs UEFI EFI_UNICODE_COLLATION_PROTOCOL protocol to provide Unicode strings function.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>EnglishDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>UnicodeCollationEng.h</Filename>
-    <Filename>UnicodeCollationEng.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiUnicodeCollationProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeUnicodeCollationEng</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa
deleted file mode 100644
index 87bd7d8d71..0000000000
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa
+++ /dev/null
@@ -1,80 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DriverSample</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>FE3542FE-C1D3-4EF8-657C-8048606FF671</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module DriverSample</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation. All rights reserved.</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DriverSample</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DriverSample.h</Filename>
-    <Filename>VfrStrings.uni</Filename>
-    <Filename>NVDataStruc.h</Filename>
-    <Filename>inventorystrings.uni</Filename>
-    <Filename>DriverSample.c</Filename>
-    <Filename>DriverSample.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiHiiDatabaseProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiFormBrowser2ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiHiiConfigAccessProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiHiiConfigRoutingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiHiiStringProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>DriverSampleInit</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxe.msa b/MdeModulePkg/Universal/EbcDxe/EbcDxe.msa
deleted file mode 100644
index 957f7008db..0000000000
--- a/MdeModulePkg/Universal/EbcDxe/EbcDxe.msa
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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>Ebc</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>13AC6DD0-73D0-11D4-B06B-00AA00BD6DE7</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Ebc module.</Abstract>
-    <Description>This module for the EBC virtual machine implementation produces 
-      EBC and EBC debug support protocols.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>false</BinaryModule>
-    <OutputFileBasename>Ebc</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>EbcInt.c</Filename>
-    <Filename>EbcInt.h</Filename>
-    <Filename>EbcExecute.c</Filename>
-    <Filename>EbcExecute.h</Filename>
-    <Filename>Ebc.dxs</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EbcLowLevel.asm</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EbcLowLevel.S</Filename>
-    <Filename SupArchList="IA32">Ia32/EbcSupport.c</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">x64/EbcLowLevel.asm</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">x64/EbcLowLevel.S</Filename>
-    <Filename SupArchList="X64">x64/EbcSupport.c</Filename>
-    <Filename SupArchList="IPF">Ipf/EbcLowLevel.s</Filename>
-    <Filename SupArchList="IPF">Ipf/EbcSupport.c</Filename>
-    <Filename SupArchList="IPF">Ipf/EbcSupport.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageGuid="2759ded5-bb57-4b06-af4f-c398fa552719"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiEbcProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiDebugSupportProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeEbcDriver</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.msa b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.msa
deleted file mode 100644
index f07cb72abc..0000000000
--- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.msa
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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>FtwLite</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>4C862FC6-0E54-4e36-8C8F-FF6F3167951F</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for FtwLite module.</Abstract>
-    <Description>This driver provides fault tolerant write capability for block devices.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>FtwLite</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>FtwLite.h</Filename>
-    <Filename>FtwLite.c</Filename>
-    <Filename>FtwMisc.c</Filename>
-    <Filename>FtwWorkSpace.c</Filename>
-    <Filename>FtwLite.dxs</Filename>
-    <Filename SupArchList="IA32 EBC">Ia32/Ia32FtwMisc.c</Filename>
-    <Filename SupArchList="X64">x64/x64FtwMisc.c</Filename>
-    <Filename SupArchList="IPF">Ipf/IpfFtwMisc.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageGuid="BA0D78D6-2CAF-414b-BD4D-B6762A894288"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 EBC">
-      <ProtocolCName>gEfiPciRootBridgeIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiSystemNvDataFvGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeFtwLite</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>
-      <TokenSpaceGuidCName>gEfiMdeModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>To get base address of the FTW spare block section in NV firmware volume.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>
-      <TokenSpaceGuidCName>gEfiMdeModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>To get size of the FTW spare block section in NV firmware volume.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>
-      <TokenSpaceGuidCName>gEfiMdeModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>To get base address of the FTW working block section in NV firmware volume.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>
-      <TokenSpaceGuidCName>gEfiMdeModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>To get size of the FTW working block section in NV firmware volume.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.msa b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.msa
deleted file mode 100644
index 2b3cf9b460..0000000000
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.msa
+++ /dev/null
@@ -1,79 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>HiiDatabase</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>348C4D62-BFBD-4882-9ECE-C80BB1C4783B</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module HiiDatabase</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation. All rights reserved.</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>HiiDatabase</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>R8Lib.c</Filename>
-    <Filename>R8Lib.h</Filename>
-    <Filename>Font.c</Filename>
-    <Filename>Database.c</Filename>
-    <Filename>String.c</Filename>
-    <Filename>ConfigRouting.c</Filename>
-    <Filename>HiiDatabase.dxs</Filename>
-    <Filename>HiiDatabase.h</Filename>
-    <Filename>Image.c</Filename>
-    <Filename>HiiDatabaseEntry.c</Filename>
-    <Filename>CVS\TortoiseCVS.Status</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeHiiDatabase</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.msa b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.msa
deleted file mode 100644
index 95c5c274b4..0000000000
--- a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.msa
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>PeiBaseMemoryTestInit</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>736EB068-8C01-47c5-964B-1C57BD5D4D64</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for PeiBaseMemoryTestInit module.</Abstract>
-    <Description>This driver provides memory test ppi for memory test in Pei Phase.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiBaseMemoryTestInit</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeimEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>BaseMemoryTest.h</Filename>
-    <Filename>BaseMemoryTest.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <PPIs>
-    <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>gPeiBaseMemoryTestPpiGuid</PpiCName>
-    </Ppi>
-  </PPIs>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PeiBaseMemoryTestInit</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.msa b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.msa
deleted file mode 100644
index ade8ce1050..0000000000
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.msa
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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>NullMemoryTest</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>96B5C032-DF4C-4b6e-8232-438DCF448D0E</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for NullMemoryTest module.</Abstract>
-    <Description>This driver installs EFI_GENERIC_MEMORY_TEST_PROTOCOL to 
-      provide simple generic memory test functions.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>NullMemoryTest</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DxeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Common.h</Filename>
-    <Filename>NullMemoryTest.c</Filename>
-    <Filename>NullMemoryTest.h</Filename>
-    <Filename>NullMemoryTest.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageGuid="BA0D78D6-2CAF-414b-BD4D-B6762A894288"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiGenericMemTestProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>GenericMemoryTestEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.msa b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.msa
deleted file mode 100644
index 291f2ea680..0000000000
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.msa
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>MonotonicCounter</ModuleName>
-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>
-    <GuidValue>AD608272-D07F-4964-801E-7BD3B7888652</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for MonotonicCounter module.</Abstract>
-    <Description>This module produces UEFI Monotonic Counter Boot and Runtime Services.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>MonotonicCounter</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MonotonicCounter.c</Filename>
-    <Filename>MonotonicCounter.h</Filename>
-    <Filename>MonotonicCounter.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiMonotonicCounterArchProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>MonotonicCounterDriverInitialize</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.msa b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.msa
deleted file mode 100644
index b790fddb56..0000000000
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.msa
+++ /dev/null
@@ -1,72 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>Arp</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>529D3F93-E8E9-4e73-B1E1-BDF6A9D50113</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module Arp</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Arp</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ArpDriver.c</Filename>
-    <Filename>ArpImpl.c</Filename>
-    <Filename>ArpImpl.h</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>ArpDriver.h</Filename>
-    <Filename>ArpMain.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiArpProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiManagedNetworkProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiArpServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiManagedNetworkServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>ArpDriverEntryPoint</ModuleEntryPoint>
-      <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.msa b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.msa
deleted file mode 100644
index 2dac8b41d9..0000000000
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.msa
+++ /dev/null
@@ -1,78 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>Dhcp4Dxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>94734718-0BBC-47fb-96A5-EE7A5AE6A2AD</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module Dhcp4</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Dhcp4Dxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Dhcp4Impl.h</Filename>
-    <Filename>Dhcp4Option.h</Filename>
-    <Filename>Dhcp4Option.c</Filename>
-    <Filename>Dhcp4Driver.c</Filename>
-    <Filename>Dhcp4Driver.h</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>Dhcp4Io.h</Filename>
-    <Filename>Dhcp4Io.c</Filename>
-    <Filename>Dhcp4Impl.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDhcp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUdp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDhcp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUdp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>Dhcp4DriverEntryPoint</ModuleEntryPoint>
-      <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.msa b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.msa
deleted file mode 100644
index 644ee42e3d..0000000000
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.msa
+++ /dev/null
@@ -1,78 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>Ip4Config</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>26841BDE-920A-4e7a-9FBE-637F477143A6</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module Ip4Config</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Ip4Config</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Ip4Config.c</Filename>
-    <Filename>NicIp4Variable.h</Filename>
-    <Filename>Ip4Config.h</Filename>
-    <Filename>Ip4ConfigDriver.c</Filename>
-    <Filename>NicIp4Variable.c</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDhcp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiManagedNetworkProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiIp4ConfigProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiManagedNetworkServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDhcp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>Ip4ConfigDriverEntryPoint</ModuleEntryPoint>
-      <ModuleUnloadImage>EfiIp4ConfigUnload</ModuleUnloadImage>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.msa b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.msa
deleted file mode 100644
index f8d225a5dc..0000000000
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.msa
+++ /dev/null
@@ -1,102 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>Ip4Dxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>9FB1A1F3-3B71-4324-B39A-745CBB015FFF</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module Ip4</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Ip4Dxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Ip4Input.c</Filename>
-    <Filename>Ip4Icmp.h</Filename>
-    <Filename>Ip4Route.c</Filename>
-    <Filename>Ip4Input.h</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>Ip4Output.h</Filename>
-    <Filename>Ip4Option.c</Filename>
-    <Filename>Ip4If.h</Filename>
-    <Filename>Ip4Common.c</Filename>
-    <Filename>Ip4Driver.h</Filename>
-    <Filename>Ip4Impl.h</Filename>
-    <Filename>Ip4Common.h</Filename>
-    <Filename>Ip4Impl.c</Filename>
-    <Filename>Ip4Igmp.c</Filename>
-    <Filename>Ip4Icmp.c</Filename>
-    <Filename>Ip4Output.c</Filename>
-    <Filename>Ip4Igmp.h</Filename>
-    <Filename>Ip4If.c</Filename>
-    <Filename>Ip4Route.h</Filename>
-    <Filename>Ip4Option.h</Filename>
-    <Filename>Ip4Driver.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiArpProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiManagedNetworkProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiIp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiArpServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiIp4ConfigProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiManagedNetworkServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiIp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>Ip4DriverEntryPoint</ModuleEntryPoint>
-      <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa
deleted file mode 100644
index 71bdcfdb09..0000000000
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa
+++ /dev/null
@@ -1,70 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>MnpDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>025BBFC7-E6A9-4b8b-82AD-6815A1AEAF4A</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module Mnp</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>MnpDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MnpImpl.h</Filename>
-    <Filename>MnpConfig.c</Filename>
-    <Filename>MnpDriver.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>MnpDriver.h</Filename>
-    <Filename>MnpIo.c</Filename>
-    <Filename>MnpMain.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiManagedNetworkProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiManagedNetworkServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>MnpDriverEntryPoint</ModuleEntryPoint>
-      <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.msa b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.msa
deleted file mode 100644
index 2f07834dde..0000000000
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.msa
+++ /dev/null
@@ -1,80 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>Mtftp4Dxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>DC3641B8-2FA8-4ed3-BC1F-F9962A03454B</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module Mtftp4</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Mtftp4Dxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Mtftp4Wrq.c</Filename>
-    <Filename>Mtftp4Driver.c</Filename>
-    <Filename>Mtftp4Driver.h</Filename>
-    <Filename>Mtftp4Support.h</Filename>
-    <Filename>Mtftp4Option.h</Filename>
-    <Filename>Mtftp4Impl.c</Filename>
-    <Filename>Mtftp4Support.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>Mtftp4Impl.h</Filename>
-    <Filename>Mtftp4Rrq.c</Filename>
-    <Filename>Mtftp4Option.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUdp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUdp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiMtftp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiMtftp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>Mtftp4DriverEntryPoint</ModuleEntryPoint>
-      <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.msa b/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.msa
deleted file mode 100644
index 5f470aeb26..0000000000
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.msa
+++ /dev/null
@@ -1,106 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BC</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>A3f436EA-A127-4EF8-957C-8048606FF670</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module BC</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BC</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>pxe_bc_udp.c</Filename>
-    <Filename>pxe_bc_igmp.c</Filename>
-    <Filename>tftp.h</Filename>
-    <Filename>pxe_loadfile.c</Filename>
-    <Filename>bc.h</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>BcEntry.c</Filename>
-    <Filename>ipf\PxeArch.h</Filename>
-    <Filename>ebc\PxeArch.h</Filename>
-    <Filename SupArchList="X64">x64\PxeArch.h</Filename>
-    <Filename>pxe_bc_tcp.c</Filename>
-    <Filename>hton.h</Filename>
-    <Filename>pxe_bc_arp.c</Filename>
-    <Filename>pxe_bc_dhcp.c</Filename>
-    <Filename>pxe_bc_ip.c</Filename>
-    <Filename>ip.h</Filename>
-    <Filename>dhcp.h</Filename>
-    <Filename>bc.c</Filename>
-    <Filename>pxe_bc_mtftp.c</Filename>
-    <Filename>ia32\PxeArch.h</Filename>
-    <Filename>ebc\PxeArch.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPxeBaseCodeProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPxeBaseCodeCallbackProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiBisProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiSmbiosTableGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeBCDriver</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4Dxe.msa b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4Dxe.msa
deleted file mode 100644
index b3a4c078ff..0000000000
--- a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4Dxe.msa
+++ /dev/null
@@ -1,78 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PxeDhcp4</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>a46c3330-be36-4977-9d24-a7cf92eef0fe</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module PxeDhcp4</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PxeDhcp4</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PxeDhcp4Run.c</Filename>
-    <Filename>PxeDhcp4InitSelect.c</Filename>
-    <Filename>PxeDhcp4Entry.c</Filename>
-    <Filename>PxeDhcp4.c</Filename>
-    <Filename>PxeDhcp4.h</Filename>
-    <Filename>PxeDhcp4RenewRebind.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>PxeDhcp4Setup.c</Filename>
-    <Filename>PxeDhcp4Release.c</Filename>
-    <Filename>support.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPxeDhcp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPxeDhcp4CallbackProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPxeBaseCodeProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PxeDhcp4DriverEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.msa b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.msa
deleted file mode 100644
index e9c017e9cd..0000000000
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.msa
+++ /dev/null
@@ -1,90 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>SnpDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>A2f436EA-A127-4EF8-957C-8048606FF670</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module SNP</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>SnpDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>station_address.c</Filename>
-    <Filename>SNPEntry.c</Filename>
-    <Filename>callback.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>initialize.c</Filename>
-    <Filename>receive_filters.c</Filename>
-    <Filename>WaitForPacket.c</Filename>
-    <Filename>transmit.c</Filename>
-    <Filename>mcast_ip_to_mac.c</Filename>
-    <Filename>shutdown.c</Filename>
-    <Filename>reset.c</Filename>
-    <Filename>statistics.c</Filename>
-    <Filename>stop.c</Filename>
-    <Filename>snp.c</Filename>
-    <Filename>start.c</Filename>
-    <Filename>get_status.c</Filename>
-    <Filename>nvdata.c</Filename>
-    <Filename>snp.h</Filename>
-    <Filename>receive.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeSnpNiiDriver</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.msa b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.msa
deleted file mode 100644
index 7fca1f5872..0000000000
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.msa
+++ /dev/null
@@ -1,91 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>Tcp4Dxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>6d6963ab-906d-4a65-a7ca-bd40e5d6af4d</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module Tcp4</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Tcp4Dxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Tcp4Option.c</Filename>
-    <Filename>Tcp4Func.h</Filename>
-    <Filename>Tcp4Driver.c</Filename>
-    <Filename>Tcp4Io.c</Filename>
-    <Filename>Tcp4Driver.h</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>Socket.h</Filename>
-    <Filename>Tcp4Main.c</Filename>
-    <Filename>Tcp4Misc.c</Filename>
-    <Filename>Tcp4Input.c</Filename>
-    <Filename>Tcp4Dispatcher.c</Filename>
-    <Filename>Tcp4Option.h</Filename>
-    <Filename>Tcp4Timer.c</Filename>
-    <Filename>Tcp4Output.c</Filename>
-    <Filename>SockImpl.h</Filename>
-    <Filename>Tcp4Main.h</Filename>
-    <Filename>Tcp4Proto.h</Filename>
-    <Filename>SockInterface.c</Filename>
-    <Filename>SockImpl.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiTcp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiIp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiTcp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiIp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>Tcp4DriverEntryPoint</ModuleEntryPoint>
-      <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.msa b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.msa
deleted file mode 100644
index 451acf05ba..0000000000
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.msa
+++ /dev/null
@@ -1,78 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>Udp4Dxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>6d6963ab-906d-4a65-a7ca-bd40e5d6af2b</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module Udp4</Abstract>
-    <Description>FIX ME!</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Udp4Dxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Udp4Driver.c</Filename>
-    <Filename>Udp4Driver.h</Filename>
-    <Filename>Udp4Impl.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>Udp4Main.c</Filename>
-    <Filename>Udp4Impl.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUdp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiIp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUdp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiIp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>Udp4DriverEntryPoint</ModuleEntryPoint>
-      <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.msa b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.msa
deleted file mode 100644
index cbf131a63f..0000000000
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.msa
+++ /dev/null
@@ -1,108 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiPxeBcDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>3B1DEAB5-C75D-442e-9238-8E2FFB62B0BB</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module UefiPxeBc</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation. All rights reserved.</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiPxeBcDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PxeBcDriver.h</Filename>
-    <Filename>PxeBcMtftp.h</Filename>
-    <Filename>PxeBcDhcp.c</Filename>
-    <Filename>PxeBcImpl.h</Filename>
-    <Filename>PxeBcImpl.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>PxeBcDhcp.h</Filename>
-    <Filename>ipf\PxeArch.h</Filename>
-    <Filename>PxeBcDriver.c</Filename>
-    <Filename SupArchList="X64">x64\PxeArch.h</Filename>
-    <Filename>PxeBcSupport.c</Filename>
-    <Filename>PxeBcSupport.h</Filename>
-    <Filename>ia32\PxeArch.h</Filename>
-    <Filename>PxeBcMtftp.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid_31</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUdp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDhcp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPxeBaseCodeProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPxeBaseCodeCallbackProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDhcp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUdp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiMtftp4ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiMtftp4ServiceBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiSmbiosTableGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PxeBcDriverEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.msa b/MdeModulePkg/Universal/PCD/Dxe/Pcd.msa
deleted file mode 100644
index d920f68e92..0000000000
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.msa
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>PcdDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>80CF7257-87AB-47f9-A3FE-D50B76D89541</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for PCD service DXE driver.</Abstract>
-    <Description>This DXE driver implement and produce the PCD protocol.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PcdDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Service.h</Filename>
-    <Filename>Service.c</Filename>
-    <Filename>Pcd.c</Filename>
-    <Filename>Pcd.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gPcdProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Hobs>
-    <HobTypes Usage="ALWAYS_CONSUMED" HobGuidCName="gPcdDataBaseHobGuid">
-      <HobType>GUID_EXTENSION</HobType>
-    </HobTypes>
-  </Hobs>
-  <Externs>
-    <PcdIsDriver>DXE_PCD_DRIVER</PcdIsDriver>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PcdDxeInit</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdVpdBaseAddress</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The base address of the VPD (Vital Product Data) region. It is 
-        normally a region reserved on flash.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdDxePcdDatabaseTraverseEnabled</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This feature flag can be used to enable or disable the Pcd DXE database 
-        traverse capability. Disable it can reduce the size of final image generated.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.msa b/MdeModulePkg/Universal/PCD/Pei/Pcd.msa
deleted file mode 100644
index 155a576443..0000000000
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.msa
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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>PcdPeim</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>9B3ADA4F-AE56-4c24-8DEA-F03B7558AE50</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Pcd Database PEIM module</Abstract>
-    <Description>This PEIM driver implement and produce PCD PPI.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PcdPeim</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeimEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Pcd.dxs</Filename>
-    <Filename>Pcd.c</Filename>
-    <Filename>Service.h</Filename>
-    <Filename>Service.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Hobs>
-    <HobTypes Usage="ALWAYS_PRODUCED" HobGuidCName="gPcdDataBaseHobGuid">
-      <HobType>GUID_EXTENSION</HobType>
-    </HobTypes>
-    <HobTypes Usage="ALWAYS_PRODUCED" HobGuidCName="gPcdPeiCallbackFnTableHobGuid">
-      <HobType>GUID_EXTENSION</HobType>
-    </HobTypes>
-  </Hobs>
-  <PPIs>
-    <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>gPcdPpiGuid</PpiCName>
-    </Ppi>
-    <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>gEfiPeiReadOnlyVariablePpiGuid</PpiCName>
-    </Ppi>
-  </PPIs>
-  <Externs>
-    <PcdIsDriver>PEI_PCD_DRIVER</PcdIsDriver>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PcdPeimInit</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The maximum number of callback function, which will be triggered when 
-        a PCD entry is been set, can be registered for a single PCD entry in PEI phase.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdVpdBaseAddress</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The base address of the VPD (Vital Product Data) region. It is 
-        normally a region reserved on flash.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdPeiPcdDatabaseTraverseEnabled</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This feature flag can be used to enable or disable the Pcd PEIM database 
-        traverse capability. Disable it can reduce the size of final image generated.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdPeiPcdDatabaseCallbackOnSetEnabled</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable the Callback On SET capability of PCD service PEIM. If a platform does not register any callback on set  in PEI phase. This flag can be set to DISABLE to save size.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdPeiPcdDatabaseExEnabled</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable the PCD service PEIM to handle DynamicEX PCD. If a platform has no module to use DynamicEX  in PEI phase. This flag can be set to DISABLE to save size.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdPeiPcdDatabaseGetSizeEnabled</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable the GET size capability of PCD service PEIM. If a platform does not do PCD get size operation in PEI phase. This flag can be set to DISABLE to save size.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdPeiPcdDatabaseSetEnabled</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable the SET capability of PCD service PEIM. If a platform does not do PCD SET operation in PEI phase. This flag can be set to DISABLE to save size.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.msa b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.msa
deleted file mode 100644
index c1b88e2706..0000000000
--- a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.msa
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PcRtc</ModuleName>
-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>
-    <GuidValue>378D7B65-8DA9-4773-B6E4-A47826A833E1</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>PcRtc driver to install EFI_REAL_TIME_CLOCK_ARCH_PROTOCOL.</Abstract>
-    <Description>This driver provides GetTime, SetTime, GetWakeupTime, SetWakeupTime services to Runtime Service Table.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>
-      Copyright (c) 2006 - 2007 Intel Corporation. <BR>
-      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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PcRtc</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>IoLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>TimerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PcRtc.h</Filename>
-    <Filename>PcRtc.c</Filename>
-    <Filename>Ia32PcRtc.dxs</Filename>
-    <Filename>Ia32/Ia32PcRtc.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiRealTimeClockArchProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializePcRtc</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/SingleSegmentPciCfgPei.msa b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/SingleSegmentPciCfgPei.msa
deleted file mode 100644
index 3afa8b4e66..0000000000
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/SingleSegmentPciCfgPei.msa
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PciCfg</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>27A5159D-5E61-4809-919A-422E887101EF</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Single Segment Pci Configuration PPI</Abstract>
-    <Description>This file declares PciCfg PPI used to access PCI configuration space in PEI</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>
-      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.
-    </License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PciCfg</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PciLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeimEntryPoint</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PciCfg.dxs</Filename>
-    <Filename>PciCfg.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <PPIs>
-    <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>gEfiPciCfgPpiInServiceTableGuid</PpiCName>
-    </Ppi>
-  </PPIs>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PeimInitializePciCfg</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverrideDxe.msa b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverrideDxe.msa
deleted file mode 100644
index 6e1645af35..0000000000
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverrideDxe.msa
+++ /dev/null
@@ -1,50 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PlatformDriOverrideDxe</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>35034CE2-A6E5-4fb4-BABE-A0156E9B2549</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module PlatformDriOverride</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation. All rights reserved.</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PlatformDriOverrideDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PlatformDriOverride.h</Filename>
-    <Filename>PlatformDriOverride.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PlatformDriverOverrideEntry</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.msa b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.msa
deleted file mode 100644
index 7bf5d22d00..0000000000
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.msa
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>SecurityStub</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>F80697E9-7FD6-4665-8646-88E33EF71DFC</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for SecurityStub module</Abstract>
-    <Description>This driver supports platform security service.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>SecurityStub</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-      <Keyword>DebugLib</Keyword>
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>SecurityStub.dxs</Filename>
-    <Filename>SecurityStub.h</Filename>
-    <Filename>SecurityStub.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiSecurityArchProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>SecurityStubInitialize</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.msa b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.msa
deleted file mode 100644
index 57774992fe..0000000000
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.msa
+++ /dev/null
@@ -1,84 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>SetupBrowser</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>EBf342FE-B1D3-4EF8-957C-8048606FF671</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module SetupBrowser</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation. All rights reserved.</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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>SetupBrowser</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>R8Lib.h</Filename>
-    <Filename>Print.h</Filename>
-    <Filename>Setup.c</Filename>
-    <Filename>Setup.h</Filename>
-    <Filename>Ui.h</Filename>
-    <Filename>Print.c</Filename>
-    <Filename>SetupBrowser.dxs</Filename>
-    <Filename>R8Lib.c</Filename>
-    <Filename>ProcessOptions.c</Filename>
-    <Filename>InputHandler.c</Filename>
-    <Filename>Ui.c</Filename>
-    <Filename>IfrParse.c</Filename>
-    <Filename>Expression.c</Filename>
-    <Filename>Colors.h</Filename>
-    <Filename>Presentation.c</Filename>
-    <Filename>SetupBrowserStr.uni</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPrintProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeSetup</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.msa b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.msa
deleted file mode 100644
index 80aa3bf2b0..0000000000
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.msa
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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>EmuVariable</ModuleName>
-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>
-    <GuidValue>02B01AD5-7E59-43e8-A6D8-238180613A5A</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Emulation Variable for EFI_RUNTIME_SERVICES.</Abstract>
-    <Description>This module provides three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>EmuVariable</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Variable.h</Filename>
-    <Filename>EmuVariable.c</Filename>
-    <Filename>EmuVariable.dxs</Filename>
-    <Filename>InitVariable.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED" SupArchList="IA32 X64">
-      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED" SupArchList="IA32 X64">
-      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>VariableServiceInitialize</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.msa b/MdeModulePkg/Universal/Variable/Pei/Variable.msa
deleted file mode 100644
index 565ae31a13..0000000000
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.msa
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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>PeiVariable</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>34C8C28F-B61C-45a2-8F2E-89E46BECC63B</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for PeiVariable module.</Abstract>
-    <Description>Framework PEIM to provide the Variable functionality.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiVariable</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeimEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Variable.h</Filename>
-    <Filename>Variable.c</Filename>
-    <Filename>Variable.dxs</Filename>
-    <Filename SupArchList="IA32 X64 EBC">VariableWorker.c</Filename>
-    <Filename SupArchList="IPF">Ipf/VariableWorker.c</Filename>
-    <Filename SupArchList="IA32">Ia32/VarMachine.h</Filename>
-    <Filename SupArchList="EBC">Ebc/VarMachine.h</Filename>
-    <Filename SupArchList="X64">x64/VarMachine.h</Filename>
-    <Filename SupArchList="IPF">Ipf/VarMachine.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <PPIs>
-    <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>gEfiPeiReadOnlyVariablePpiGuid</PpiCName>
-    </Ppi>
-  </PPIs>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PeimInitializeVariableServices</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdFlashNvStorageVariableBase</C_Name>
-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The driver gets the Variable store base address from this PCD.  This base address point to
-        an EFI_FIRMWARE_VOLUMN_HEADER struct.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
deleted file mode 100644
index 56f19b0437..0000000000
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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>Variable</ModuleName>
-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>
-    <GuidValue>CBD2E4D5-7068-4FF5-B462-9822B4AD8D60</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Variable module.</Abstract>
-    <Description>This module installs three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Variable</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DxeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>EdkFvbServiceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Variable.h</Filename>
-    <Filename>Variable.c</Filename>
-    <Filename>reclaim.h</Filename>
-    <Filename>reclaim.c</Filename>
-    <Filename>InitVariable.c</Filename>
-    <Filename>Variable.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>VariableServiceInitialize</ModuleEntryPoint>
-    </Extern>
-    <Extern>
-      <SetVirtualAddressMapCallBack>VariableClassAddressChangeEvent</SetVirtualAddressMapCallBack>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdFlashNvStorageVariableBase</C_Name>
-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The driver gets the Variable store base address from this PCD.  This base address point to
-        an EFI_FIRMWARE_VOLUMN_HEADER struct.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdFlashNvStorageVariableSize</C_Name>
-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The driver gets the NvStorage Variable Size from this PCD.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.msa b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.msa
deleted file mode 100644
index 0f3c6b0a10..0000000000
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.msa
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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>WatchdogTimer</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>F099D67F-71AE-4c36-B2A3-DCEB0EB2B7D8</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for WatchdogTimer module.</Abstract>
-    <Description>Generic watchdog timer implemenetation using EFI APIs.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>WatchdogTimer</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>WatchdogTimer.c</Filename>
-    <Filename>WatchdogTimer.h</Filename>
-    <Filename>WatchdogTimer.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiWatchdogTimerArchProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>WatchdogTimerDriverInitialize</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
author	lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>	2008-08-25 05:03:29 +0000
committer	lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>	2008-08-25 05:03:29 +0000
commit	e87298818044a116c8b5a805d2c2ae27a4ae2029 (patch)
tree	72dba59d54adf086771d0ed43dfb13ae8c221c2a
parent	14bcde689e3e352cbeebbd98d6e5d97a5178acc7 (diff)
download	edk2-e87298818044a116c8b5a805d2c2ae27a4ae2029.tar.gz edk2-e87298818044a116c8b5a805d2c2ae27a4ae2029.tar.bz2 edk2-e87298818044a116c8b5a805d2c2ae27a4ae2029.zip