Obsoleted by new schema and new build tools.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@821 6f19259b-4bc3-4df7-8a09-765794883524
author: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524> 2006-07-07 09:28:33 +0000
committer: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524> 2006-07-07 09:28:33 +0000
commit: 44050d53afe3a38812977a3e8f5f2860237a3690 (patch)
tree: 0138fcdbb0d3082353dd090eca504824566a6179 /EdkModulePkg/Universal
parent: f46d7c213b49f97e68d6339aa9df3f70b15d9b59 (diff)
download: edk2-44050d53afe3a38812977a3e8f5f2860237a3690.zip
edk2-44050d53afe3a38812977a3e8f5f2860237a3690.tar.gz
edk2-44050d53afe3a38812977a3e8f5f2860237a3690.tar.bz2
64 files changed, 0 insertions, 2920 deletions
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.mbd b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.mbd
deleted file mode 100644
index 1ae0c53..0000000
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.mbd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>CapsuleRuntime</BaseName>
-    <Guid>42857F0A-13F2-4B21-8A23-53D3F714B840</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>BaseLib</Library>
-    <Library>BaseMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeServicesTableLib</Library>
-    <Library>EdkDxeRuntimeDriverLib</Library>
-    <Library>UefiLib</Library>
-    <Library>BaseDebugLibNull</Library>
-    <Library>BasePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiBootServicesTableLib</Library>    
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/build.xml b/EdkModulePkg/Universal/Capsule/RuntimeDxe/build.xml
deleted file mode 100644
index d376719..0000000
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="CapsuleRuntime"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Capsule/RuntimeDxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="CapsuleRuntime">
-      <GenBuild baseName="CapsuleRuntime" mbdFilename="${MODULE_DIR}/CapsuleRuntime.mbd" msaFilename="${MODULE_DIR}/CapsuleRuntime.msa"/>
-   </target>
-   <target depends="CapsuleRuntime_clean" name="clean"/>
-   <target depends="CapsuleRuntime_cleanall" name="cleanall"/>
-   <target name="CapsuleRuntime_clean">
-      <OutputDirSetup baseName="CapsuleRuntime" mbdFilename="${MODULE_DIR}/CapsuleRuntime.mbd" msaFilename="${MODULE_DIR}/CapsuleRuntime.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/CapsuleRuntime_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/CapsuleRuntime_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="CapsuleRuntime_cleanall">
-      <OutputDirSetup baseName="CapsuleRuntime" mbdFilename="${MODULE_DIR}/CapsuleRuntime.mbd" msaFilename="${MODULE_DIR}/CapsuleRuntime.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/CapsuleRuntime_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/CapsuleRuntime_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**CapsuleRuntime*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.mbd b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.mbd
deleted file mode 100644
index 8d32865..0000000
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.mbd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>ConSplitter</BaseName>
-    <Guid>408edcec-cf6d-477c-a5a8-b4844e3de281</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>    
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/build.xml b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/build.xml
deleted file mode 100644
index dc1058a..0000000
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/build.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="ConSplitter"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Console/ConSplitter/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="ConSplitter">
-      <GenBuild baseName="ConSplitter" mbdFilename="${MODULE_DIR}/ConSplitter.mbd" msaFilename="${MODULE_DIR}/ConSplitter.msa"/>
-   </target>
-   <target name="ConSplitterLite">
-      <GenBuild baseName="ConSplitterLite" mbdFilename="${MODULE_DIR}/ConSplitterLite.mbd" msaFilename="${MODULE_DIR}/ConSplitterLite.msa"/>
-   </target>
-   <target depends="ConSplitter_clean" name="clean"/>
-   <target depends="ConSplitter_cleanall" name="cleanall"/>
-   <target name="ConSplitter_clean">
-      <OutputDirSetup baseName="ConSplitter" mbdFilename="${MODULE_DIR}/ConSplitter.mbd" msaFilename="${MODULE_DIR}/ConSplitter.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/ConSplitter_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/ConSplitter_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="ConSplitterLite_clean">
-      <OutputDirSetup baseName="ConSplitterLite" mbdFilename="${MODULE_DIR}/ConSplitterLite.mbd" msaFilename="${MODULE_DIR}/ConSplitterLite.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/ConSplitterLite_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/ConSplitterLite_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="ConSplitter_cleanall">
-      <OutputDirSetup baseName="ConSplitter" mbdFilename="${MODULE_DIR}/ConSplitter.mbd" msaFilename="${MODULE_DIR}/ConSplitter.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/ConSplitter_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/ConSplitter_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**ConSplitter*"/>
-      </delete>
-   </target>
-   <target name="ConSplitterLite_cleanall">
-      <OutputDirSetup baseName="ConSplitterLite" mbdFilename="${MODULE_DIR}/ConSplitterLite.mbd" msaFilename="${MODULE_DIR}/ConSplitterLite.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/ConSplitterLite_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/ConSplitterLite_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**ConSplitterLite*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.mbd b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.mbd
deleted file mode 100644
index 7e6d607..0000000
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.mbd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>GraphicsConsole</BaseName>
-    <Guid>CCCB0C28-4B24-11d5-9A5A-0090273FC14D</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>HiiLib</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>    
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/build.xml b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/build.xml
deleted file mode 100644
index 852b17b..0000000
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="GraphicsConsole"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Console/GraphicsConsole/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="GraphicsConsole">
-      <GenBuild baseName="GraphicsConsole" mbdFilename="${MODULE_DIR}/GraphicsConsole.mbd" msaFilename="${MODULE_DIR}/GraphicsConsole.msa"/>
-   </target>
-   <target depends="GraphicsConsole_clean" name="clean"/>
-   <target depends="GraphicsConsole_cleanall" name="cleanall"/>
-   <target name="GraphicsConsole_clean">
-      <OutputDirSetup baseName="GraphicsConsole" mbdFilename="${MODULE_DIR}/GraphicsConsole.mbd" msaFilename="${MODULE_DIR}/GraphicsConsole.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/GraphicsConsole_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/GraphicsConsole_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="GraphicsConsole_cleanall">
-      <OutputDirSetup baseName="GraphicsConsole" mbdFilename="${MODULE_DIR}/GraphicsConsole.mbd" msaFilename="${MODULE_DIR}/GraphicsConsole.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/GraphicsConsole_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/GraphicsConsole_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**GraphicsConsole*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.mbd b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.mbd
deleted file mode 100644
index 602b027..0000000
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.mbd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Terminal</BaseName>
-    <Guid>9E863906-A40F-4875-977F-5B93FF237FC6</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-22 19:05</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>EdkDxePrintLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/build.xml b/EdkModulePkg/Universal/Console/Terminal/Dxe/build.xml
deleted file mode 100644
index e9d06dd..0000000
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Terminal"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Console/Terminal/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="Terminal">
-      <GenBuild baseName="Terminal" mbdFilename="${MODULE_DIR}/Terminal.mbd" msaFilename="${MODULE_DIR}/Terminal.msa"/>
-   </target>
-   <target depends="Terminal_clean" name="clean"/>
-   <target depends="Terminal_cleanall" name="cleanall"/>
-   <target name="Terminal_clean">
-      <OutputDirSetup baseName="Terminal" mbdFilename="${MODULE_DIR}/Terminal.mbd" msaFilename="${MODULE_DIR}/Terminal.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Terminal_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Terminal_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Terminal_cleanall">
-      <OutputDirSetup baseName="Terminal" mbdFilename="${MODULE_DIR}/Terminal.mbd" msaFilename="${MODULE_DIR}/Terminal.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Terminal_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Terminal_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Terminal*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.mbd b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.mbd
deleted file mode 100644
index b03adbb..0000000
--- a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.mbd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>DataHub</BaseName>
-    <Guid>53BCC14F-C24F-434C-B294-8ED2D4CC1860</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>    
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/build.xml b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/build.xml
deleted file mode 100644
index fcf00f8..0000000
--- a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="DataHub"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/DataHub/DataHub/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DataHub">
-      <GenBuild baseName="DataHub" mbdFilename="${MODULE_DIR}/DataHub.mbd" msaFilename="${MODULE_DIR}/DataHub.msa"/>
-   </target>
-   <target depends="DataHub_clean" name="clean"/>
-   <target depends="DataHub_cleanall" name="cleanall"/>
-   <target name="DataHub_clean">
-      <OutputDirSetup baseName="DataHub" mbdFilename="${MODULE_DIR}/DataHub.mbd" msaFilename="${MODULE_DIR}/DataHub.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DataHub_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DataHub_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DataHub_cleanall">
-      <OutputDirSetup baseName="DataHub" mbdFilename="${MODULE_DIR}/DataHub.mbd" msaFilename="${MODULE_DIR}/DataHub.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DataHub_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DataHub_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DataHub*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.mbd b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.mbd
deleted file mode 100644
index 00378d6..0000000
--- a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.mbd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-   <MbdHeader>
-    <BaseName>DataHubStdErr</BaseName>
-    <Guid>CA515306-00CE-4032-874E-11B755FF6866</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>DxeMemoryLib</Library>    
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>    
-    <Library>BaseLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/build.xml b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/build.xml
deleted file mode 100644
index e712520..0000000
--- a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="DataHubStdErr"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/DataHub/DataHubStdErr/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DataHubStdErr">
-      <GenBuild baseName="DataHubStdErr" mbdFilename="${MODULE_DIR}/DataHubStdErr.mbd" msaFilename="${MODULE_DIR}/DataHubStdErr.msa"/>
-   </target>
-   <target depends="DataHubStdErr_clean" name="clean"/>
-   <target depends="DataHubStdErr_cleanall" name="cleanall"/>
-   <target name="DataHubStdErr_clean">
-      <OutputDirSetup baseName="DataHubStdErr" mbdFilename="${MODULE_DIR}/DataHubStdErr.mbd" msaFilename="${MODULE_DIR}/DataHubStdErr.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DataHubStdErr_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DataHubStdErr_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DataHubStdErr_cleanall">
-      <OutputDirSetup baseName="DataHubStdErr" mbdFilename="${MODULE_DIR}/DataHubStdErr.mbd" msaFilename="${MODULE_DIR}/DataHubStdErr.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DataHubStdErr_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DataHubStdErr_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DataHubStdErr*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.mbd b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.mbd
deleted file mode 100644
index c85b5f0..0000000
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.mbd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>DebugSupport</BaseName>
-    <Guid>911D584C-35F7-4955-BEF9-B452769DDC3A</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryLib</Library>    
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>    
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/build.xml b/EdkModulePkg/Universal/DebugSupport/Dxe/build.xml
deleted file mode 100644
index 06a7f1d..0000000
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="DebugSupport"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/DebugSupport/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DebugSupport">
-      <GenBuild baseName="DebugSupport" mbdFilename="${MODULE_DIR}/DebugSupport.mbd" msaFilename="${MODULE_DIR}/DebugSupport.msa"/>
-   </target>
-   <target depends="DebugSupport_clean" name="clean"/>
-   <target depends="DebugSupport_cleanall" name="cleanall"/>
-   <target name="DebugSupport_clean">
-      <OutputDirSetup baseName="DebugSupport" mbdFilename="${MODULE_DIR}/DebugSupport.mbd" msaFilename="${MODULE_DIR}/DebugSupport.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DebugSupport_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DebugSupport_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DebugSupport_cleanall">
-      <OutputDirSetup baseName="DebugSupport" mbdFilename="${MODULE_DIR}/DebugSupport.mbd" msaFilename="${MODULE_DIR}/DebugSupport.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DebugSupport_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DebugSupport_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DebugSupport*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.mbd b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.mbd
deleted file mode 100644
index a50e07d..0000000
--- a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.mbd
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>DebugPort</BaseName>
-    <Guid>73E9457A-CEA1-4917-9A9C-9F1F0F0FD322</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>    
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/build.xml b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/build.xml
deleted file mode 100644
index 4b9c2e4..0000000
--- a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="DebugPort"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Debugger/Debugport/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DebugPort">
-      <GenBuild baseName="DebugPort" mbdFilename="${MODULE_DIR}/DebugPort.mbd" msaFilename="${MODULE_DIR}/DebugPort.msa"/>
-   </target>
-   <target depends="DebugPort_clean" name="clean"/>
-   <target depends="DebugPort_cleanall" name="cleanall"/>
-   <target name="DebugPort_clean">
-      <OutputDirSetup baseName="DebugPort" mbdFilename="${MODULE_DIR}/DebugPort.mbd" msaFilename="${MODULE_DIR}/DebugPort.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DebugPort_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DebugPort_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DebugPort_cleanall">
-      <OutputDirSetup baseName="DebugPort" mbdFilename="${MODULE_DIR}/DebugPort.mbd" msaFilename="${MODULE_DIR}/DebugPort.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DebugPort_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DebugPort_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DebugPort*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.mbd b/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.mbd
deleted file mode 100644
index 36b10a9..0000000
--- a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.mbd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>DiskIo</BaseName>
-    <Guid>6B38F7B4-AD98-40e9-9093-ACA2B5A253C4</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>    
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/build.xml b/EdkModulePkg/Universal/Disk/DiskIo/Dxe/build.xml
deleted file mode 100644
index 6c19fe4..0000000
--- a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="DiskIo"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Disk/DiskIo/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DiskIo">
-      <GenBuild baseName="DiskIo" mbdFilename="${MODULE_DIR}/DiskIo.mbd" msaFilename="${MODULE_DIR}/DiskIo.msa"/>
-   </target>
-   <target depends="DiskIo_clean" name="clean"/>
-   <target depends="DiskIo_cleanall" name="cleanall"/>
-   <target name="DiskIo_clean">
-      <OutputDirSetup baseName="DiskIo" mbdFilename="${MODULE_DIR}/DiskIo.mbd" msaFilename="${MODULE_DIR}/DiskIo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DiskIo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DiskIo_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DiskIo_cleanall">
-      <OutputDirSetup baseName="DiskIo" mbdFilename="${MODULE_DIR}/DiskIo.mbd" msaFilename="${MODULE_DIR}/DiskIo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DiskIo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DiskIo_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DiskIo*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.mbd b/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.mbd
deleted file mode 100644
index 20e96d2..0000000
--- a/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.mbd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Partition</BaseName>
-    <Guid>1FA1F39E-FEFF-4aae-BD7B-38A070A3B609</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>    
-    <Library>UefiDevicePathLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Disk/Partition/Dxe/build.xml b/EdkModulePkg/Universal/Disk/Partition/Dxe/build.xml
deleted file mode 100644
index 42d5194..0000000
--- a/EdkModulePkg/Universal/Disk/Partition/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Partition"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Disk/Partition/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="Partition">
-      <GenBuild baseName="Partition" mbdFilename="${MODULE_DIR}/Partition.mbd" msaFilename="${MODULE_DIR}/Partition.msa"/>
-   </target>
-   <target depends="Partition_clean" name="clean"/>
-   <target depends="Partition_cleanall" name="cleanall"/>
-   <target name="Partition_clean">
-      <OutputDirSetup baseName="Partition" mbdFilename="${MODULE_DIR}/Partition.mbd" msaFilename="${MODULE_DIR}/Partition.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Partition_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Partition_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Partition_cleanall">
-      <OutputDirSetup baseName="Partition" mbdFilename="${MODULE_DIR}/Partition.mbd" msaFilename="${MODULE_DIR}/Partition.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Partition_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Partition_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Partition*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.mbd b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.mbd
deleted file mode 100644
index 8ea3fa1..0000000
--- a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.mbd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>English</BaseName>
-    <Guid>CD3BAFB6-50FB-4fe8-8E4E-AB74D2C1A600</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryLib</Library>    
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>    
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/build.xml b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/build.xml
deleted file mode 100644
index ab86d5a..0000000
--- a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="English"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Disk/UnicodeCollation/English/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="English">
-      <GenBuild baseName="English" mbdFilename="${MODULE_DIR}/English.mbd" msaFilename="${MODULE_DIR}/English.msa"/>
-   </target>
-   <target depends="English_clean" name="clean"/>
-   <target depends="English_cleanall" name="cleanall"/>
-   <target name="English_clean">
-      <OutputDirSetup baseName="English" mbdFilename="${MODULE_DIR}/English.mbd" msaFilename="${MODULE_DIR}/English.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/English_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/English_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="English_cleanall">
-      <OutputDirSetup baseName="English" mbdFilename="${MODULE_DIR}/English.mbd" msaFilename="${MODULE_DIR}/English.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/English_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/English_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**English*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Ebc/Dxe/Ebc.mbd b/EdkModulePkg/Universal/Ebc/Dxe/Ebc.mbd
deleted file mode 100644
index 6df88d8..0000000
--- a/EdkModulePkg/Universal/Ebc/Dxe/Ebc.mbd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Ebc</BaseName>
-    <Guid>13AC6DD0-73D0-11D4-B06B-00AA00BD6DE7</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-22 14:03</Created>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>EdkDxePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Ebc/Dxe/build.xml b/EdkModulePkg/Universal/Ebc/Dxe/build.xml
deleted file mode 100644
index 93f107b..0000000
--- a/EdkModulePkg/Universal/Ebc/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Ebc"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Ebc/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="Ebc">
-      <GenBuild baseName="Ebc" mbdFilename="${MODULE_DIR}/Ebc.mbd" msaFilename="${MODULE_DIR}/Ebc.msa"/>
-   </target>
-   <target depends="Ebc_clean" name="clean"/>
-   <target depends="Ebc_cleanall" name="cleanall"/>
-   <target name="Ebc_clean">
-      <OutputDirSetup baseName="Ebc" mbdFilename="${MODULE_DIR}/Ebc.mbd" msaFilename="${MODULE_DIR}/Ebc.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Ebc_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Ebc_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Ebc_cleanall">
-      <OutputDirSetup baseName="Ebc" mbdFilename="${MODULE_DIR}/Ebc.mbd" msaFilename="${MODULE_DIR}/Ebc.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Ebc_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Ebc_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Ebc*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.mbd b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.mbd
deleted file mode 100644
index 5bac48f..0000000
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.mbd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>EmuVariable</BaseName>
-    <Guid>CBD2E4D5-7068-4FF5-B866-9822B4AD8D60</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-23 16:05</Created>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseMemoryLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>EdkDxeRuntimeDriverLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Arch ArchType="IPF">
-      <Library>EdkDxeSalLib</Library>
-    </Arch>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/build.xml b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/build.xml
deleted file mode 100644
index 11153e6..0000000
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="EmuVariable"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/EmuVariable/RuntimeDxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EmuVariable">
-      <GenBuild baseName="EmuVariable" mbdFilename="${MODULE_DIR}/EmuVariable.mbd" msaFilename="${MODULE_DIR}/EmuVariable.msa"/>
-   </target>
-   <target depends="EmuVariable_clean" name="clean"/>
-   <target depends="EmuVariable_cleanall" name="cleanall"/>
-   <target name="EmuVariable_clean">
-      <OutputDirSetup baseName="EmuVariable" mbdFilename="${MODULE_DIR}/EmuVariable.mbd" msaFilename="${MODULE_DIR}/EmuVariable.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EmuVariable_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EmuVariable_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EmuVariable_cleanall">
-      <OutputDirSetup baseName="EmuVariable" mbdFilename="${MODULE_DIR}/EmuVariable.mbd" msaFilename="${MODULE_DIR}/EmuVariable.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EmuVariable_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EmuVariable_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EmuVariable*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.mbd b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.mbd
deleted file mode 100644
index 5a05499..0000000
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.mbd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>FtwLite</BaseName>
-    <Guid>4C862FC6-0E54-4e36-8C8F-FF6F3167951F</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-22 14:11</Created>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>DxeHobLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>EdkDxePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/build.xml b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/build.xml
deleted file mode 100644
index 37d04b5..0000000
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="FtwLite"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="FtwLite">
-      <GenBuild baseName="FtwLite" mbdFilename="${MODULE_DIR}/FtwLite.mbd" msaFilename="${MODULE_DIR}/FtwLite.msa"/>
-   </target>
-   <target depends="FtwLite_clean" name="clean"/>
-   <target depends="FtwLite_cleanall" name="cleanall"/>
-   <target name="FtwLite_clean">
-      <OutputDirSetup baseName="FtwLite" mbdFilename="${MODULE_DIR}/FtwLite.mbd" msaFilename="${MODULE_DIR}/FtwLite.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/FtwLite_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/FtwLite_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="FtwLite_cleanall">
-      <OutputDirSetup baseName="FtwLite" mbdFilename="${MODULE_DIR}/FtwLite.mbd" msaFilename="${MODULE_DIR}/FtwLite.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/FtwLite_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/FtwLite_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**FtwLite*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.mbd b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.mbd
deleted file mode 100644
index 35dadef..0000000
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.mbd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Crc32SectionExtract</BaseName>
-    <Guid>51C9F40C-5243-4473-B265-B3C8FFAFF9FA</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>EdkDxePrintLib</Library>
-    <Library>BaseLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/build.xml b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/build.xml
deleted file mode 100644
index 774e588..0000000
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Crc32SectionExtract"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="Crc32SectionExtract">
-      <GenBuild baseName="Crc32SectionExtract" mbdFilename="${MODULE_DIR}/Crc32SectionExtract.mbd" msaFilename="${MODULE_DIR}/Crc32SectionExtract.msa"/>
-   </target>
-   <target depends="Crc32SectionExtract_clean" name="clean"/>
-   <target depends="Crc32SectionExtract_cleanall" name="cleanall"/>
-   <target name="Crc32SectionExtract_clean">
-      <OutputDirSetup baseName="Crc32SectionExtract" mbdFilename="${MODULE_DIR}/Crc32SectionExtract.mbd" msaFilename="${MODULE_DIR}/Crc32SectionExtract.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Crc32SectionExtract_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Crc32SectionExtract_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Crc32SectionExtract_cleanall">
-      <OutputDirSetup baseName="Crc32SectionExtract" mbdFilename="${MODULE_DIR}/Crc32SectionExtract.mbd" msaFilename="${MODULE_DIR}/Crc32SectionExtract.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Crc32SectionExtract_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Crc32SectionExtract_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Crc32SectionExtract*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.mbd b/EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.mbd
deleted file mode 100644
index 7a9b1ee..0000000
--- a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.mbd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>NullMemoryTest</BaseName>
-    <Guid>96B5C032-DF4C-4b6e-8232-438DCF448D0E</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryLib</Library>    
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeServicesTableLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>    
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/build.xml b/EdkModulePkg/Universal/GenericMemoryTest/Dxe/build.xml
deleted file mode 100644
index 0556891..0000000
--- a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="NullMemoryTest"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/GenericMemoryTest/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="NullMemoryTest">
-      <GenBuild baseName="NullMemoryTest" mbdFilename="${MODULE_DIR}/NullMemoryTest.mbd" msaFilename="${MODULE_DIR}/NullMemoryTest.msa"/>
-   </target>
-   <target depends="NullMemoryTest_clean" name="clean"/>
-   <target depends="NullMemoryTest_cleanall" name="cleanall"/>
-   <target name="NullMemoryTest_clean">
-      <OutputDirSetup baseName="NullMemoryTest" mbdFilename="${MODULE_DIR}/NullMemoryTest.mbd" msaFilename="${MODULE_DIR}/NullMemoryTest.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/NullMemoryTest_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/NullMemoryTest_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="NullMemoryTest_cleanall">
-      <OutputDirSetup baseName="NullMemoryTest" mbdFilename="${MODULE_DIR}/NullMemoryTest.mbd" msaFilename="${MODULE_DIR}/NullMemoryTest.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/NullMemoryTest_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/NullMemoryTest_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**NullMemoryTest*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd
deleted file mode 100644
index 2a85959..0000000
--- a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>PeiBaseMemoryTestInit</BaseName>
-    <Guid>736EB068-8C01-47c5-964B-1C57BD5D4D64</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>    
-    <Library>PeimEntryPoint</Library>
-    <Library>PeiReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>PeiServicesTablePointerLib</Library>
-    <Library>PeiMemoryLib</Library>
-    <Library>PeiServicesLib</Library>
-    <Library>BaseLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Pei/build.xml b/EdkModulePkg/Universal/GenericMemoryTest/Pei/build.xml
deleted file mode 100644
index cf6dfea..0000000
--- a/EdkModulePkg/Universal/GenericMemoryTest/Pei/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="PeiBaseMemoryTestInit"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/GenericMemoryTest/Pei"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="PeiBaseMemoryTestInit">
-      <GenBuild baseName="PeiBaseMemoryTestInit" mbdFilename="${MODULE_DIR}/BaseMemoryTest.mbd" msaFilename="${MODULE_DIR}/BaseMemoryTest.msa"/>
-   </target>
-   <target depends="PeiBaseMemoryTestInit_clean" name="clean"/>
-   <target depends="PeiBaseMemoryTestInit_cleanall" name="cleanall"/>
-   <target name="PeiBaseMemoryTestInit_clean">
-      <OutputDirSetup baseName="PeiBaseMemoryTestInit" mbdFilename="${MODULE_DIR}/BaseMemoryTest.mbd" msaFilename="${MODULE_DIR}/BaseMemoryTest.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/PeiBaseMemoryTestInit_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/PeiBaseMemoryTestInit_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="PeiBaseMemoryTestInit_cleanall">
-      <OutputDirSetup baseName="PeiBaseMemoryTestInit" mbdFilename="${MODULE_DIR}/BaseMemoryTest.mbd" msaFilename="${MODULE_DIR}/BaseMemoryTest.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/PeiBaseMemoryTestInit_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/PeiBaseMemoryTestInit_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**PeiBaseMemoryTestInit*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.mbd b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.mbd
deleted file mode 100644
index 2c298e2..0000000
--- a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.mbd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>MonotonicCounter</BaseName>
-    <Guid>AD608272-D07F-4964-801E-7BD3B7888652</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-22 14:36</Created>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>BaseMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>EdkDxeRuntimeDriverLib</Library>
-    <Arch ArchType="IPF">
-      <Library>EdkDxeSalLib</Library>
-    </Arch>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/build.xml b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/build.xml
deleted file mode 100644
index 88115e4..0000000
--- a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="MonotonicCounter"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/MonotonicCounter/RuntimeDxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="MonotonicCounter">
-      <GenBuild baseName="MonotonicCounter" mbdFilename="${MODULE_DIR}/MonotonicCounter.mbd" msaFilename="${MODULE_DIR}/MonotonicCounter.msa"/>
-   </target>
-   <target depends="MonotonicCounter_clean" name="clean"/>
-   <target depends="MonotonicCounter_cleanall" name="cleanall"/>
-   <target name="MonotonicCounter_clean">
-      <OutputDirSetup baseName="MonotonicCounter" mbdFilename="${MODULE_DIR}/MonotonicCounter.mbd" msaFilename="${MODULE_DIR}/MonotonicCounter.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/MonotonicCounter_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/MonotonicCounter_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="MonotonicCounter_cleanall">
-      <OutputDirSetup baseName="MonotonicCounter" mbdFilename="${MODULE_DIR}/MonotonicCounter.mbd" msaFilename="${MODULE_DIR}/MonotonicCounter.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/MonotonicCounter_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/MonotonicCounter_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**MonotonicCounter*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.mbd b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.mbd
deleted file mode 100644
index f3f8175..0000000
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.mbd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>BC</BaseName>
-    <Guid>A3f436EA-A127-4EF8-957C-8048606FF670</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>EdkDxePrintLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/build.xml b/EdkModulePkg/Universal/Network/PxeBc/Dxe/build.xml
deleted file mode 100644
index e0b5ee6..0000000
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="BC"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Network/PxeBc/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="BC">
-      <GenBuild baseName="BC" mbdFilename="${MODULE_DIR}/BC.mbd" msaFilename="${MODULE_DIR}/BC.msa"/>
-   </target>
-   <target depends="BC_clean" name="clean"/>
-   <target depends="BC_cleanall" name="cleanall"/>
-   <target name="BC_clean">
-      <OutputDirSetup baseName="BC" mbdFilename="${MODULE_DIR}/BC.mbd" msaFilename="${MODULE_DIR}/BC.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/BC_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/BC_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="BC_cleanall">
-      <OutputDirSetup baseName="BC" mbdFilename="${MODULE_DIR}/BC.mbd" msaFilename="${MODULE_DIR}/BC.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/BC_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/BC_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**BC*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.mbd b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.mbd
deleted file mode 100644
index d9a50f4..0000000
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.mbd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Dhcp4</BaseName>
-    <Guid>a46c3330-be36-4977-9d24-a7cf92eef0fe</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/build.xml b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/build.xml
deleted file mode 100644
index 086aefc..0000000
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Dhcp4"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Network/PxeDhcp4/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="Dhcp4">
-      <GenBuild baseName="Dhcp4" mbdFilename="${MODULE_DIR}/Dhcp4.mbd" msaFilename="${MODULE_DIR}/Dhcp4.msa"/>
-   </target>
-   <target depends="Dhcp4_clean" name="clean"/>
-   <target depends="Dhcp4_cleanall" name="cleanall"/>
-   <target name="Dhcp4_clean">
-      <OutputDirSetup baseName="Dhcp4" mbdFilename="${MODULE_DIR}/Dhcp4.mbd" msaFilename="${MODULE_DIR}/Dhcp4.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Dhcp4_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Dhcp4_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Dhcp4_cleanall">
-      <OutputDirSetup baseName="Dhcp4" mbdFilename="${MODULE_DIR}/Dhcp4.mbd" msaFilename="${MODULE_DIR}/Dhcp4.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Dhcp4_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Dhcp4_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Dhcp4*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.mbd b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.mbd
deleted file mode 100644
index 5d4985b..0000000
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.mbd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>SNP</BaseName>
-    <Guid>A2f436EA-A127-4EF8-957C-8048606FF670</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/build.xml b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/build.xml
deleted file mode 100644
index 74b81f4..0000000
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="SNP"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Network/Snp32_64/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="SNP">
-      <GenBuild baseName="SNP" mbdFilename="${MODULE_DIR}/SNP.mbd" msaFilename="${MODULE_DIR}/SNP.msa"/>
-   </target>
-   <target depends="SNP_clean" name="clean"/>
-   <target depends="SNP_cleanall" name="cleanall"/>
-   <target name="SNP_clean">
-      <OutputDirSetup baseName="SNP" mbdFilename="${MODULE_DIR}/SNP.mbd" msaFilename="${MODULE_DIR}/SNP.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/SNP_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/SNP_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="SNP_cleanall">
-      <OutputDirSetup baseName="SNP" mbdFilename="${MODULE_DIR}/SNP.mbd" msaFilename="${MODULE_DIR}/SNP.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/SNP_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/SNP_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**SNP*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.mbd b/EdkModulePkg/Universal/PCD/Dxe/Pcd.mbd
deleted file mode 100644
index 66bd5a0..0000000
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.mbd
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>PcdDxe</BaseName>
-    <Guid>80CF7257-87AB-47f9-A3FE-D50B76D89541</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeHobLib</Library>
-    <Library>UefiLib</Library>
-    <Library>HiiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>EdkDxeRuntimeDriverLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/PCD/Dxe/build.xml b/EdkModulePkg/Universal/PCD/Dxe/build.xml
deleted file mode 100644
index 4e27a1d..0000000
--- a/EdkModulePkg/Universal/PCD/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="PcdDxe"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/PCD/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="PcdDxe">
-      <GenBuild baseName="PcdDxe" mbdFilename="${MODULE_DIR}/Pcd.mbd" msaFilename="${MODULE_DIR}/Pcd.msa"/>
-   </target>
-   <target depends="PcdDxe_clean" name="clean"/>
-   <target depends="PcdDxe_cleanall" name="cleanall"/>
-   <target name="PcdDxe_clean">
-      <OutputDirSetup baseName="PcdDxe" mbdFilename="${MODULE_DIR}/Pcd.mbd" msaFilename="${MODULE_DIR}/Pcd.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/PcdDxe_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/PcdDxe_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="PcdDxe_cleanall">
-      <OutputDirSetup baseName="PcdDxe" mbdFilename="${MODULE_DIR}/Pcd.mbd" msaFilename="${MODULE_DIR}/Pcd.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/PcdDxe_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/PcdDxe_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**PcdDxe*"/>
-      </delete>
-   </target>
-</project>
diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd b/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
deleted file mode 100644
index e28c1b9..0000000
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>PcdEmulatorPeim</BaseName>
-    <Guid>9B3ADA4F-AE56-4c24-8DEA-F03B7558AE50</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-24 18:54</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>PeimEntryPoint</Library>
-    <Library>BaseLib</Library>
-    <Library>PeiServicesLib</Library>
-    <Library OverrideID="4444">PeiServicesTablePointerLib</Library>
-    <Library>PeiHobLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>PeiMemoryLib</Library>
-    <Library>PeiReportStatusCodeLib</Library>
-    <Library>PeiMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/PCD/Pei/build.xml b/EdkModulePkg/Universal/PCD/Pei/build.xml
deleted file mode 100644
index 07aef0d..0000000
--- a/EdkModulePkg/Universal/PCD/Pei/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="PcdPeim"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/PCD/Pei"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="PcdPeim">
-      <GenBuild baseName="PcdPeim" mbdFilename="${MODULE_DIR}/Pcd.mbd" msaFilename="${MODULE_DIR}/Pcd.msa"/>
-   </target>
-   <target depends="PcdPeim_clean" name="clean"/>
-   <target depends="PcdPeim_cleanall" name="cleanall"/>
-   <target name="PcdPeim_clean">
-      <OutputDirSetup baseName="PcdPeim" mbdFilename="${MODULE_DIR}/Pcd.mbd" msaFilename="${MODULE_DIR}/Pcd.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/PcdPeim_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/PcdPeim_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="PcdPeim_cleanall">
-      <OutputDirSetup baseName="PcdPeim" mbdFilename="${MODULE_DIR}/Pcd.mbd" msaFilename="${MODULE_DIR}/Pcd.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/PcdPeim_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/PcdPeim_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**PcdPeim*"/>
-      </delete>
-   </target>
-</project>
diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.mbd b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.mbd
deleted file mode 100644
index 0eed93e..0000000
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.mbd
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Runtime</BaseName>
-    <Guid>B601F8C4-43B7-4784-95B1-F4226CB40CEE</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>BaseMemoryLib</Library>
-    <Library>EdkDxeRuntimeDriverLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Arch ArchType="IPF">
-      <Library>EdkDxeSalLib</Library>
-    </Arch>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/build.xml b/EdkModulePkg/Universal/Runtime/RuntimeDxe/build.xml
deleted file mode 100644
index 48f5fe7..0000000
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Runtime"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Runtime/RuntimeDxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="Runtime">
-      <GenBuild baseName="Runtime" mbdFilename="${MODULE_DIR}/Runtime.mbd" msaFilename="${MODULE_DIR}/Runtime.msa"/>
-   </target>
-   <target depends="Runtime_clean" name="clean"/>
-   <target depends="Runtime_cleanall" name="cleanall"/>
-   <target name="Runtime_clean">
-      <OutputDirSetup baseName="Runtime" mbdFilename="${MODULE_DIR}/Runtime.mbd" msaFilename="${MODULE_DIR}/Runtime.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Runtime_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Runtime_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Runtime_cleanall">
-      <OutputDirSetup baseName="Runtime" mbdFilename="${MODULE_DIR}/Runtime.mbd" msaFilename="${MODULE_DIR}/Runtime.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Runtime_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Runtime_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Runtime*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.mbd b/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.mbd
deleted file mode 100644
index 9899585..0000000
--- a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.mbd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>SecurityStub</BaseName>
-    <Guid>F80697E9-7FD6-4665-8646-88E33EF71DFC</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-22 19:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>EdkDxePrintLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/build.xml b/EdkModulePkg/Universal/Security/SecurityStub/Dxe/build.xml
deleted file mode 100644
index 62347a3..0000000
--- a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="SecurityStub"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Security/SecurityStub/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="SecurityStub">
-      <GenBuild baseName="SecurityStub" mbdFilename="${MODULE_DIR}/SecurityStub.mbd" msaFilename="${MODULE_DIR}/SecurityStub.msa"/>
-   </target>
-   <target depends="SecurityStub_clean" name="clean"/>
-   <target depends="SecurityStub_cleanall" name="cleanall"/>
-   <target name="SecurityStub_clean">
-      <OutputDirSetup baseName="SecurityStub" mbdFilename="${MODULE_DIR}/SecurityStub.mbd" msaFilename="${MODULE_DIR}/SecurityStub.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/SecurityStub_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/SecurityStub_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="SecurityStub_cleanall">
-      <OutputDirSetup baseName="SecurityStub" mbdFilename="${MODULE_DIR}/SecurityStub.mbd" msaFilename="${MODULE_DIR}/SecurityStub.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/SecurityStub_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/SecurityStub_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**SecurityStub*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.mbd b/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.mbd
deleted file mode 100644
index b35051b..0000000
--- a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.mbd
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>StatusCode</BaseName>
-    <Guid>9F455D3B-2B8A-4c06-960B-A71B9714B9CD</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>EdkDxeRuntimeDriverLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiLib</Library>
-    <Library>BasePrintLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeIoLibCpuIo</Library>
-    <Library>BaseMemoryLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library OverrideID="1111">EdkRtPlatformStatusCodeLib</Library>
-    <Library OverrideID="1111">EdkRtMemoryStatusCodeLib</Library>
-    <Library OverrideID="1111">EdkBsDataHubStatusCodeLib</Library>
-    <Library>DxeHobLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>EdkMemoryStatusCodeLib</Library>
-    
-    <Arch ArchType="IPF">
-      <Library>EdkDxeSalLib</Library>
-    </Arch>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/build.xml b/EdkModulePkg/Universal/StatusCode/RuntimeDxe/build.xml
deleted file mode 100644
index 7376068..0000000
--- a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="StatusCode"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/StatusCode/RuntimeDxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="StatusCode">
-      <GenBuild baseName="StatusCode" mbdFilename="${MODULE_DIR}/StatusCode.mbd" msaFilename="${MODULE_DIR}/StatusCode.msa"/>
-   </target>
-   <target depends="StatusCode_clean" name="clean"/>
-   <target depends="StatusCode_cleanall" name="cleanall"/>
-   <target name="StatusCode_clean">
-      <OutputDirSetup baseName="StatusCode" mbdFilename="${MODULE_DIR}/StatusCode.mbd" msaFilename="${MODULE_DIR}/StatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/StatusCode_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/StatusCode_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="StatusCode_cleanall">
-      <OutputDirSetup baseName="StatusCode" mbdFilename="${MODULE_DIR}/StatusCode.mbd" msaFilename="${MODULE_DIR}/StatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/StatusCode_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/StatusCode_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**StatusCode*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.mbd b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.mbd
deleted file mode 100644
index b8d2589..0000000
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.mbd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>HiiDatabase</BaseName>
-    <Guid>FCD337AB-B1D3-4EF8-957C-8048606FF670</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>BaseMemoryLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>EdkIfrSupportLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/build.xml b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/build.xml
deleted file mode 100644
index f39f754..0000000
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="HiiDatabase"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/UserInterface/HiiDataBase/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="HiiDatabase">
-      <GenBuild baseName="HiiDatabase" mbdFilename="${MODULE_DIR}/HiiDatabase.mbd" msaFilename="${MODULE_DIR}/HiiDatabase.msa"/>
-   </target>
-   <target depends="HiiDatabase_clean" name="clean"/>
-   <target depends="HiiDatabase_cleanall" name="cleanall"/>
-   <target name="HiiDatabase_clean">
-      <OutputDirSetup baseName="HiiDatabase" mbdFilename="${MODULE_DIR}/HiiDatabase.mbd" msaFilename="${MODULE_DIR}/HiiDatabase.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/HiiDatabase_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/HiiDatabase_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="HiiDatabase_cleanall">
-      <OutputDirSetup baseName="HiiDatabase" mbdFilename="${MODULE_DIR}/HiiDatabase.mbd" msaFilename="${MODULE_DIR}/HiiDatabase.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/HiiDatabase_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/HiiDatabase_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**HiiDatabase*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd
deleted file mode 100644
index 54bcafa..0000000
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>DriverSample</BaseName>
-    <Guid>FE3542FE-C1D3-4EF8-657C-8048606FF670</Guid>
-    <Version>0</Version>
-    <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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>BasePrintLib</Library>
-    <Library>EdkGraphicsLib</Library>
-    <Library>EdkIfrSupportLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>HiiLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/build.xml b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/build.xml
deleted file mode 100644
index 5cc8859..0000000
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="DriverSample"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/UserInterface/SetupBrowser/Dxe/DriverSample"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DriverSample">
-      <GenBuild baseName="DriverSample" mbdFilename="${MODULE_DIR}/DriverSample.mbd" msaFilename="${MODULE_DIR}/DriverSample.msa"/>
-   </target>
-   <target depends="DriverSample_clean" name="clean"/>
-   <target depends="DriverSample_cleanall" name="cleanall"/>
-   <target name="DriverSample_clean">
-      <OutputDirSetup baseName="DriverSample" mbdFilename="${MODULE_DIR}/DriverSample.mbd" msaFilename="${MODULE_DIR}/DriverSample.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DriverSample_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DriverSample_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DriverSample_cleanall">
-      <OutputDirSetup baseName="DriverSample" mbdFilename="${MODULE_DIR}/DriverSample.mbd" msaFilename="${MODULE_DIR}/DriverSample.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DriverSample_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DriverSample_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DriverSample*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd
deleted file mode 100644
index 609bcf8..0000000
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>SetupBrowser</BaseName>
-    <Guid>EBf342FE-B1D3-4EF8-957C-8048606FF670</Guid>
-    <Version>0</Version>
-    <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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>BasePrintLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>EdkGraphicsLib</Library>
-    <Library>HiiLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/build.xml b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/build.xml
deleted file mode 100644
index 8e3b5c5..0000000
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="SetupBrowser"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/UserInterface/SetupBrowser/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="SetupBrowser">
-      <GenBuild baseName="SetupBrowser" mbdFilename="${MODULE_DIR}/SetupBrowser.mbd" msaFilename="${MODULE_DIR}/SetupBrowser.msa"/>
-   </target>
-   <target depends="SetupBrowser_clean" name="clean"/>
-   <target depends="SetupBrowser_cleanall" name="cleanall"/>
-   <target name="SetupBrowser_clean">
-      <OutputDirSetup baseName="SetupBrowser" mbdFilename="${MODULE_DIR}/SetupBrowser.mbd" msaFilename="${MODULE_DIR}/SetupBrowser.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/SetupBrowser_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/SetupBrowser_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="SetupBrowser_cleanall">
-      <OutputDirSetup baseName="SetupBrowser" mbdFilename="${MODULE_DIR}/SetupBrowser.mbd" msaFilename="${MODULE_DIR}/SetupBrowser.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/SetupBrowser_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/SetupBrowser_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**SetupBrowser*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.mbd b/EdkModulePkg/Universal/Variable/Pei/Variable.mbd
deleted file mode 100644
index d091ef6..0000000
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.mbd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>PeiVariable</BaseName>
-    <Guid>34C8C28F-B61C-45a2-8F2E-89E46BECC63B</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>PeiReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>BaseLib</Library>
-    <Library>PeiMemoryLib</Library>
-    <Library>PeiServicesLib</Library>
-    <Library OverrideID="4444">PeiServicesTablePointerLib</Library>
-    <Library>PeiHobLib</Library>
-    <Library>PeimEntryPoint</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Variable/Pei/build.xml b/EdkModulePkg/Universal/Variable/Pei/build.xml
deleted file mode 100644
index 95255e7..0000000
--- a/EdkModulePkg/Universal/Variable/Pei/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="PeiVariable"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Variable/Pei"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="PeiVariable">
-      <GenBuild baseName="PeiVariable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>
-   </target>
-   <target depends="PeiVariable_clean" name="clean"/>
-   <target depends="PeiVariable_cleanall" name="cleanall"/>
-   <target name="PeiVariable_clean">
-      <OutputDirSetup baseName="PeiVariable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/PeiVariable_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/PeiVariable_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="PeiVariable_cleanall">
-      <OutputDirSetup baseName="PeiVariable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/PeiVariable_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/PeiVariable_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**PeiVariable*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd
deleted file mode 100644
index 4f7bf33..0000000
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Variable</BaseName>
-    <Guid>CBD2E4D5-7068-4FF5-B462-9822B4AD8D60</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>BaseMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>DxeServicesTableLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>EdkDxeRuntimeDriverLib</Library>
-    <Library>DxeHobLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>EdkFvbServiceLib</Library>
-    <Arch ArchType="IPF">
-      <Library>EdkDxeSalLib</Library>
-    </Arch>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/build.xml b/EdkModulePkg/Universal/Variable/RuntimeDxe/build.xml
deleted file mode 100644
index 5e948e3..0000000
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Variable"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Variable/RuntimeDxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="Variable">
-      <GenBuild baseName="Variable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>
-   </target>
-   <target depends="Variable_clean" name="clean"/>
-   <target depends="Variable_cleanall" name="cleanall"/>
-   <target name="Variable_clean">
-      <OutputDirSetup baseName="Variable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Variable_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Variable_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Variable_cleanall">
-      <OutputDirSetup baseName="Variable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/Variable_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/Variable_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Variable*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.mbd b/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.mbd
deleted file mode 100644
index 1079e26..0000000
--- a/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.mbd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>WatchDogTimer</BaseName>
-    <Guid>F099D67F-71AE-4c36-B2A3-DCEB0EB2B7D8</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>EdkDxePrintLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/WatchdogTimer/Dxe/build.xml b/EdkModulePkg/Universal/WatchdogTimer/Dxe/build.xml
deleted file mode 100644
index 976ba17..0000000
--- a/EdkModulePkg/Universal/WatchdogTimer/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="WatchDogTimer"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/WatchdogTimer/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="WatchDogTimer">
-      <GenBuild baseName="WatchDogTimer" mbdFilename="${MODULE_DIR}/WatchDogTimer.mbd" msaFilename="${MODULE_DIR}/WatchDogTimer.msa"/>
-   </target>
-   <target depends="WatchDogTimer_clean" name="clean"/>
-   <target depends="WatchDogTimer_cleanall" name="cleanall"/>
-   <target name="WatchDogTimer_clean">
-      <OutputDirSetup baseName="WatchDogTimer" mbdFilename="${MODULE_DIR}/WatchDogTimer.mbd" msaFilename="${MODULE_DIR}/WatchDogTimer.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/WatchDogTimer_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/WatchDogTimer_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WatchDogTimer_cleanall">
-      <OutputDirSetup baseName="WatchDogTimer" mbdFilename="${MODULE_DIR}/WatchDogTimer.mbd" msaFilename="${MODULE_DIR}/WatchDogTimer.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/WatchDogTimer_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/WatchDogTimer_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WatchDogTimer*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
author	jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>	2006-07-07 09:28:33 +0000
committer	jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>	2006-07-07 09:28:33 +0000
commit	44050d53afe3a38812977a3e8f5f2860237a3690 (patch)
tree	0138fcdbb0d3082353dd090eca504824566a6179 /EdkModulePkg/Universal
parent	f46d7c213b49f97e68d6339aa9df3f70b15d9b59 (diff)
download	edk2-44050d53afe3a38812977a3e8f5f2860237a3690.zip edk2-44050d53afe3a38812977a3e8f5f2860237a3690.tar.gz edk2-44050d53afe3a38812977a3e8f5f2860237a3690.tar.bz2