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 /EdkNt32Pkg
parent: f46d7c213b49f97e68d6339aa9df3f70b15d9b59 (diff)
download: edk2-44050d53afe3a38812977a3e8f5f2860237a3690.tar.gz
edk2-44050d53afe3a38812977a3e8f5f2860237a3690.tar.bz2
edk2-44050d53afe3a38812977a3e8f5f2860237a3690.zip
59 files changed, 0 insertions, 2629 deletions
diff --git a/EdkNt32Pkg/Build/AprioriList.mbd b/EdkNt32Pkg/Build/AprioriList.mbd
deleted file mode 100644
index a45c09383f..0000000000
--- a/EdkNt32Pkg/Build/AprioriList.mbd
+++ /dev/null
@@ -1,32 +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>AprioriList</BaseName>
-    <Guid>0xfc510ee7, 0xffdc, 0x11d4, 0xbd, 0x41, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81</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>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.mbd b/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.mbd
deleted file mode 100644
index aa87078e81..0000000000
--- a/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.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>ConPlatform</BaseName>
-    <Guid>51ccf399-4fdf-4e55-a45b-e123f84d456a</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-13 17:06</Created>
-    <Modified>2006-03-19 15:17</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/EdkNt32Pkg/Dxe/ConPlatform/build.xml b/EdkNt32Pkg/Dxe/ConPlatform/build.xml
deleted file mode 100644
index 52d84eb934..0000000000
--- a/EdkNt32Pkg/Dxe/ConPlatform/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="ConPlatform"><!--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="Dxe\ConPlatform"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="ConPlatform">
-      <GenBuild baseName="ConPlatform" mbdFilename="${MODULE_DIR}\ConPlatform.mbd" msaFilename="${MODULE_DIR}\ConPlatform.msa"/>
-   </target>
-   <target depends="ConPlatform_clean" name="clean"/>
-   <target depends="ConPlatform_cleanall" name="cleanall"/>
-   <target name="ConPlatform_clean">
-      <OutputDirSetup baseName="ConPlatform" mbdFilename="${MODULE_DIR}\ConPlatform.mbd" msaFilename="${MODULE_DIR}\ConPlatform.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\ConPlatform_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\ConPlatform_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="ConPlatform_cleanall">
-      <OutputDirSetup baseName="ConPlatform" mbdFilename="${MODULE_DIR}\ConPlatform.mbd" msaFilename="${MODULE_DIR}\ConPlatform.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\ConPlatform_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\ConPlatform_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**ConPlatform*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.mbd b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.mbd
deleted file mode 100644
index 0367c18338..0000000000
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.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>MiscSubclass</BaseName>
-    <Guid>4A9B9DB8-EC62-4A92-818F-8AA0246D246E</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-13 17:07</Created>
-    <Modified>2006-03-23 13:50</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>HiiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/build.xml b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/build.xml
deleted file mode 100644
index 7265194134..0000000000
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/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="MiscSubclass"><!--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="Dxe\Nt32Platform\MiscSubclass"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="MiscSubclass">
-      <GenBuild baseName="MiscSubclass" mbdFilename="${MODULE_DIR}\MiscSubclassDriver.mbd" msaFilename="${MODULE_DIR}\MiscSubclassDriver.msa"/>
-   </target>
-   <target depends="MiscSubclass_clean" name="clean"/>
-   <target depends="MiscSubclass_cleanall" name="cleanall"/>
-   <target name="MiscSubclass_clean">
-      <OutputDirSetup baseName="MiscSubclass" mbdFilename="${MODULE_DIR}\MiscSubclassDriver.mbd" msaFilename="${MODULE_DIR}\MiscSubclassDriver.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\MiscSubclass_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\MiscSubclass_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="MiscSubclass_cleanall">
-      <OutputDirSetup baseName="MiscSubclass" mbdFilename="${MODULE_DIR}\MiscSubclassDriver.mbd" msaFilename="${MODULE_DIR}\MiscSubclassDriver.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\MiscSubclass_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\MiscSubclass_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**MiscSubclass*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.mbd b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.mbd
deleted file mode 100644
index 82ffc52bf9..0000000000
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.mbd
+++ /dev/null
@@ -1,54 +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>Bds</BaseName>
-    <Guid>A6F691AC-31C8-4444-854C-E2C1A6950F92</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-13 17:04</Created>
-    <Modified>2006-03-23 14:14</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeServicesTableLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>EdkGenericBdsLib</Library>
-    <Library>BasePrintLib</Library>
-    <Library>EdkGraphicsLib</Library>
-    <Library>EdkIfrSupportLib</Library>
-    <Library>HiiLib</Library>
-    <Library>DxeHobLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-    <Library>BasePerformanceLibNull</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-    <Option>DPX_SOURCE = ${PLATFORM_BDS_FILE_PATH}\Bds.dxs</Option>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/build.xml b/EdkNt32Pkg/Dxe/PlatformBds/build.xml
deleted file mode 100644
index d30fd98a89..0000000000
--- a/EdkNt32Pkg/Dxe/PlatformBds/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="Bds"><!--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="Dxe\PlatformBds"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Bds">
-      <GenBuild baseName="Bds" mbdFilename="${MODULE_DIR}\PlatformBds.mbd" msaFilename="${MODULE_DIR}\PlatformBds.msa"/>
-   </target>
-   <target depends="Bds_clean" name="clean"/>
-   <target depends="Bds_cleanall" name="cleanall"/>
-   <target name="Bds_clean">
-      <OutputDirSetup baseName="Bds" mbdFilename="${MODULE_DIR}\PlatformBds.mbd" msaFilename="${MODULE_DIR}\PlatformBds.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Bds_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Bds_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Bds_cleanall">
-      <OutputDirSetup baseName="Bds" mbdFilename="${MODULE_DIR}\PlatformBds.mbd" msaFilename="${MODULE_DIR}\PlatformBds.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Bds_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Bds_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Bds*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.mbd
deleted file mode 100644
index 5ac3148a6f..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.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>WinNtBlockIo</BaseName>
-    <Guid>F479E147-A125-11d4-BCFC-0080C73C8881</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>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>UefiDebugLibStdErr</Library>
-    <Library>BasePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/build.xml
deleted file mode 100644
index b03cad7e05..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/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="WinNtBlockIo"><!--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="Dxe\WinNtThunk\Bus\BlockIo"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtBlockIo">
-      <GenBuild baseName="WinNtBlockIo" mbdFilename="${MODULE_DIR}\WinNtBlockIo.mbd" msaFilename="${MODULE_DIR}\WinNtBlockIo.msa"/>
-   </target>
-   <target depends="WinNtBlockIo_clean" name="clean"/>
-   <target depends="WinNtBlockIo_cleanall" name="cleanall"/>
-   <target name="WinNtBlockIo_clean">
-      <OutputDirSetup baseName="WinNtBlockIo" mbdFilename="${MODULE_DIR}\WinNtBlockIo.mbd" msaFilename="${MODULE_DIR}\WinNtBlockIo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtBlockIo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtBlockIo_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtBlockIo_cleanall">
-      <OutputDirSetup baseName="WinNtBlockIo" mbdFilename="${MODULE_DIR}\WinNtBlockIo.mbd" msaFilename="${MODULE_DIR}\WinNtBlockIo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtBlockIo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtBlockIo_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtBlockIo*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.mbd
deleted file mode 100644
index 945067077c..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.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>WinNtConsole</BaseName>
-    <Guid>263631d7-5836-4b74-be48-ee22e92ce5d3</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>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>UefiDebugLibStdErr</Library>
-    <Library>BasePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/build.xml
deleted file mode 100644
index 9d227c7f0e..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/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="WinNtConsole"><!--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="Dxe\WinNtThunk\Bus\Console"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtConsole">
-      <GenBuild baseName="WinNtConsole" mbdFilename="${MODULE_DIR}\WinNtConsole.mbd" msaFilename="${MODULE_DIR}\WinNtConsole.msa"/>
-   </target>
-   <target depends="WinNtConsole_clean" name="clean"/>
-   <target depends="WinNtConsole_cleanall" name="cleanall"/>
-   <target name="WinNtConsole_clean">
-      <OutputDirSetup baseName="WinNtConsole" mbdFilename="${MODULE_DIR}\WinNtConsole.mbd" msaFilename="${MODULE_DIR}\WinNtConsole.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtConsole_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtConsole_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtConsole_cleanall">
-      <OutputDirSetup baseName="WinNtConsole" mbdFilename="${MODULE_DIR}\WinNtConsole.mbd" msaFilename="${MODULE_DIR}\WinNtConsole.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtConsole_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtConsole_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtConsole*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.mbd
deleted file mode 100644
index 6468fd029c..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.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>WinNtSerialIo</BaseName>
-    <Guid>6B41B553-A649-11d4-BD02-0080C73C8881</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-13 17:02</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>UefiDebugLibStdErr</Library>
-    <Library>BasePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/build.xml
deleted file mode 100644
index 7114d3bae2..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/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="WinNtSerialIo"><!--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="Dxe\WinNtThunk\Bus\SerialIo"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtSerialIo">
-      <GenBuild baseName="WinNtSerialIo" mbdFilename="${MODULE_DIR}\WinNtSerialIo.mbd" msaFilename="${MODULE_DIR}\WinNtSerialIo.msa"/>
-   </target>
-   <target depends="WinNtSerialIo_clean" name="clean"/>
-   <target depends="WinNtSerialIo_cleanall" name="cleanall"/>
-   <target name="WinNtSerialIo_clean">
-      <OutputDirSetup baseName="WinNtSerialIo" mbdFilename="${MODULE_DIR}\WinNtSerialIo.mbd" msaFilename="${MODULE_DIR}\WinNtSerialIo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtSerialIo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtSerialIo_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtSerialIo_cleanall">
-      <OutputDirSetup baseName="WinNtSerialIo" mbdFilename="${MODULE_DIR}\WinNtSerialIo.mbd" msaFilename="${MODULE_DIR}\WinNtSerialIo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtSerialIo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtSerialIo_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtSerialIo*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.mbd
deleted file mode 100644
index 25aef78949..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.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>WinNtSimpleFileSystem</BaseName>
-    <Guid>9C25E18B-76BA-43da-A132-DBB0997CEFEF</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>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>UefiDebugLibStdErr</Library>
-    <Library>BasePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/build.xml
deleted file mode 100644
index fc39519781..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/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="WinNtSimpleFileSystem"><!--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="Dxe\WinNtThunk\Bus\SimpleFileSystem"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtSimpleFileSystem">
-      <GenBuild baseName="WinNtSimpleFileSystem" mbdFilename="${MODULE_DIR}\WinNtSimpleFileSystem.mbd" msaFilename="${MODULE_DIR}\WinNtSimpleFileSystem.msa"/>
-   </target>
-   <target depends="WinNtSimpleFileSystem_clean" name="clean"/>
-   <target depends="WinNtSimpleFileSystem_cleanall" name="cleanall"/>
-   <target name="WinNtSimpleFileSystem_clean">
-      <OutputDirSetup baseName="WinNtSimpleFileSystem" mbdFilename="${MODULE_DIR}\WinNtSimpleFileSystem.mbd" msaFilename="${MODULE_DIR}\WinNtSimpleFileSystem.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtSimpleFileSystem_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtSimpleFileSystem_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtSimpleFileSystem_cleanall">
-      <OutputDirSetup baseName="WinNtSimpleFileSystem" mbdFilename="${MODULE_DIR}\WinNtSimpleFileSystem.mbd" msaFilename="${MODULE_DIR}\WinNtSimpleFileSystem.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtSimpleFileSystem_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtSimpleFileSystem_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtSimpleFileSystem*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.mbd
deleted file mode 100644
index 8981a35741..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.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>WinNtUga</BaseName>
-    <Guid>AB248E8D-ABE1-11d4-BD0D-0080C73C8881</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>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>UefiDebugLibStdErr</Library>
-    <Library>BasePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/build.xml
deleted file mode 100644
index 4d5022a84b..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/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="WinNtUga"><!--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="Dxe\WinNtThunk\Bus\Uga"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtUga">
-      <GenBuild baseName="WinNtUga" mbdFilename="${MODULE_DIR}\WinNtUga.mbd" msaFilename="${MODULE_DIR}\WinNtUga.msa"/>
-   </target>
-   <target depends="WinNtUga_clean" name="clean"/>
-   <target depends="WinNtUga_cleanall" name="cleanall"/>
-   <target name="WinNtUga_clean">
-      <OutputDirSetup baseName="WinNtUga" mbdFilename="${MODULE_DIR}\WinNtUga.mbd" msaFilename="${MODULE_DIR}\WinNtUga.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtUga_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtUga_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtUga_cleanall">
-      <OutputDirSetup baseName="WinNtUga" mbdFilename="${MODULE_DIR}\WinNtUga.mbd" msaFilename="${MODULE_DIR}\WinNtUga.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtUga_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtUga_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtUga*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.mbd
deleted file mode 100644
index 5059326ed7..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.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>WinNtBusDriver</BaseName>
-    <Guid>BD7E9A27-D6C5-416a-B245-5F507D95B2BD</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-13 17:02</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxePcdLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/build.xml
deleted file mode 100644
index 93d853bfd1..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/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="WinNtBusDriver"><!--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="Dxe\WinNtThunk\Bus\WinNtBusDriver"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtBusDriver">
-      <GenBuild baseName="WinNtBusDriver" mbdFilename="${MODULE_DIR}\WinNtBusDriver.mbd" msaFilename="${MODULE_DIR}\WinNtBusDriver.msa"/>
-   </target>
-   <target depends="WinNtBusDriver_clean" name="clean"/>
-   <target depends="WinNtBusDriver_cleanall" name="cleanall"/>
-   <target name="WinNtBusDriver_clean">
-      <OutputDirSetup baseName="WinNtBusDriver" mbdFilename="${MODULE_DIR}\WinNtBusDriver.mbd" msaFilename="${MODULE_DIR}\WinNtBusDriver.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtBusDriver_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtBusDriver_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtBusDriver_cleanall">
-      <OutputDirSetup baseName="WinNtBusDriver" mbdFilename="${MODULE_DIR}\WinNtBusDriver.mbd" msaFilename="${MODULE_DIR}\WinNtBusDriver.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtBusDriver_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtBusDriver_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtBusDriver*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.mbd
deleted file mode 100644
index 1e43726ef4..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.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>Metronome</BaseName>
-    <Guid>154CAB4A-52B5-46CD-99C3-4368ABBACFFD</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>DxeHobLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeWinNtLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/build.xml
deleted file mode 100644
index 5922fac8f1..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/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="Metronome"><!--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="Dxe\WinNtThunk\Chipset\Metronome"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Metronome">
-      <GenBuild baseName="Metronome" mbdFilename="${MODULE_DIR}\Metronome.mbd" msaFilename="${MODULE_DIR}\Metronome.msa"/>
-   </target>
-   <target depends="Metronome_clean" name="clean"/>
-   <target depends="Metronome_cleanall" name="cleanall"/>
-   <target name="Metronome_clean">
-      <OutputDirSetup baseName="Metronome" mbdFilename="${MODULE_DIR}\Metronome.mbd" msaFilename="${MODULE_DIR}\Metronome.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Metronome_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Metronome_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Metronome_cleanall">
-      <OutputDirSetup baseName="Metronome" mbdFilename="${MODULE_DIR}\Metronome.mbd" msaFilename="${MODULE_DIR}\Metronome.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Metronome_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Metronome_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Metronome*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.mbd
deleted file mode 100644
index 9a824efbb3..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.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>RealTimeClock</BaseName>
-    <Guid>27F05AF5-1644-4EF4-8944-48C4F75675A0</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>DxeHobLib</Library>
-    <Library>DxeWinNtLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</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/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/build.xml
deleted file mode 100644
index b649e11eb5..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/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="RealTimeClock"><!--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="Dxe\WinNtThunk\Chipset\RealTimeClock"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="RealTimeClock">
-      <GenBuild baseName="RealTimeClock" mbdFilename="${MODULE_DIR}\RealTimeClock.mbd" msaFilename="${MODULE_DIR}\RealTimeClock.msa"/>
-   </target>
-   <target depends="RealTimeClock_clean" name="clean"/>
-   <target depends="RealTimeClock_cleanall" name="cleanall"/>
-   <target name="RealTimeClock_clean">
-      <OutputDirSetup baseName="RealTimeClock" mbdFilename="${MODULE_DIR}\RealTimeClock.mbd" msaFilename="${MODULE_DIR}\RealTimeClock.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\RealTimeClock_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\RealTimeClock_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="RealTimeClock_cleanall">
-      <OutputDirSetup baseName="RealTimeClock" mbdFilename="${MODULE_DIR}\RealTimeClock.mbd" msaFilename="${MODULE_DIR}\RealTimeClock.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\RealTimeClock_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\RealTimeClock_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**RealTimeClock*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.mbd
deleted file mode 100644
index 3e61fdd8dc..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.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>Reset</BaseName>
-    <Guid>BA929954-35B0-4dd3-90CD-9634BD7E1CF1</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>DxeHobLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeWinNtLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/build.xml
deleted file mode 100644
index f924c6b261..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/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="Reset"><!--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="Dxe\WinNtThunk\Chipset\Reset"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Reset">
-      <GenBuild baseName="Reset" mbdFilename="${MODULE_DIR}\Reset.mbd" msaFilename="${MODULE_DIR}\Reset.msa"/>
-   </target>
-   <target depends="Reset_clean" name="clean"/>
-   <target depends="Reset_cleanall" name="cleanall"/>
-   <target name="Reset_clean">
-      <OutputDirSetup baseName="Reset" mbdFilename="${MODULE_DIR}\Reset.mbd" msaFilename="${MODULE_DIR}\Reset.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Reset_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Reset_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Reset_cleanall">
-      <OutputDirSetup baseName="Reset" mbdFilename="${MODULE_DIR}\Reset.mbd" msaFilename="${MODULE_DIR}\Reset.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Reset_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Reset_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Reset*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.mbd
deleted file mode 100644
index 1c03cfeab5..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.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>Timer</BaseName>
-    <Guid>C3811036-710B-4E39-8CF1-0AF9BE3A8198</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>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeHobLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>HiiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>DxeWinNtLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/build.xml
deleted file mode 100644
index fac1fa4061..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/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="Timer"><!--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="Dxe\WinNtThunk\Chipset\Timer"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Timer">
-      <GenBuild baseName="Timer" mbdFilename="${MODULE_DIR}\Timer.mbd" msaFilename="${MODULE_DIR}\Timer.msa"/>
-   </target>
-   <target depends="Timer_clean" name="clean"/>
-   <target depends="Timer_cleanall" name="cleanall"/>
-   <target name="Timer_clean">
-      <OutputDirSetup baseName="Timer" mbdFilename="${MODULE_DIR}\Timer.mbd" msaFilename="${MODULE_DIR}\Timer.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Timer_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Timer_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Timer_cleanall">
-      <OutputDirSetup baseName="Timer" mbdFilename="${MODULE_DIR}\Timer.mbd" msaFilename="${MODULE_DIR}\Timer.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Timer_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Timer_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Timer*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.mbd
deleted file mode 100644
index 7cc131daff..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.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>Cpu</BaseName>
-    <Guid>ee993080-5197-4d4e-b63c-f1f7413e33ce</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-23 16:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>HiiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-    <Option>C_STD_FLAGS = ${C_STD_FLAGS} /DSTRING_ARRAY_NAME=${BASE_NAME}Strings</Option>
-    <Option>C_STD_FLAGS = ${C_STD_FLAGS} /DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\"</Option>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/build.xml
deleted file mode 100644
index 91fe4e49ad..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/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="Cpu"><!--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="Dxe\WinNtThunk\Cpu"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Cpu">
-      <GenBuild baseName="Cpu" mbdFilename="${MODULE_DIR}\Cpu.mbd" msaFilename="${MODULE_DIR}\Cpu.msa"/>
-   </target>
-   <target depends="Cpu_clean" name="clean"/>
-   <target depends="Cpu_cleanall" name="cleanall"/>
-   <target name="Cpu_clean">
-      <OutputDirSetup baseName="Cpu" mbdFilename="${MODULE_DIR}\Cpu.mbd" msaFilename="${MODULE_DIR}\Cpu.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Cpu_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Cpu_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Cpu_cleanall">
-      <OutputDirSetup baseName="Cpu" mbdFilename="${MODULE_DIR}\Cpu.mbd" msaFilename="${MODULE_DIR}\Cpu.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Cpu_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Cpu_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Cpu*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.mbd
deleted file mode 100644
index 43add04dbc..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.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>WinNtThunk</BaseName>
-    <Guid>0C95A916-A006-11d4-BCFA-0080C73C8881</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>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeWinNtLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/build.xml
deleted file mode 100644
index 938e55f47d..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/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="WinNtThunk"><!--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="Dxe\WinNtThunk\WinNtThunk"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtThunk">
-      <GenBuild baseName="WinNtThunk" mbdFilename="${MODULE_DIR}\WinNtThunk.mbd" msaFilename="${MODULE_DIR}\WinNtThunk.msa"/>
-   </target>
-   <target depends="WinNtThunk_clean" name="clean"/>
-   <target depends="WinNtThunk_cleanall" name="cleanall"/>
-   <target name="WinNtThunk_clean">
-      <OutputDirSetup baseName="WinNtThunk" mbdFilename="${MODULE_DIR}\WinNtThunk.mbd" msaFilename="${MODULE_DIR}\WinNtThunk.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtThunk_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtThunk_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtThunk_cleanall">
-      <OutputDirSetup baseName="WinNtThunk" mbdFilename="${MODULE_DIR}\WinNtThunk.mbd" msaFilename="${MODULE_DIR}\WinNtThunk.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtThunk_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtThunk_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtThunk*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.mbd b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.mbd
deleted file mode 100644
index a054a89442..0000000000
--- a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>DxeWinNtLib</BaseName>
-    <Guid>f6b5871d-5226-41b3-a569-3ff893fdc7bc</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-31 13:20</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkNt32Pkg/Library/DxeWinNtLib/build.xml b/EdkNt32Pkg/Library/DxeWinNtLib/build.xml
deleted file mode 100644
index 5d4ab2c855..0000000000
--- a/EdkNt32Pkg/Library/DxeWinNtLib/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="DxeWinNtLib"><!--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="Library\DxeWinNtLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="DxeWinNtLib">
-      <GenBuild baseName="DxeWinNtLib" mbdFilename="${MODULE_DIR}\DxeWinNtLib.mbd" msaFilename="${MODULE_DIR}\DxeWinNtLib.msa"/>
-   </target>
-   <target depends="DxeWinNtLib_clean" name="clean"/>
-   <target depends="DxeWinNtLib_cleanall" name="cleanall"/>
-   <target name="DxeWinNtLib_clean">
-      <OutputDirSetup baseName="DxeWinNtLib" mbdFilename="${MODULE_DIR}\DxeWinNtLib.mbd" msaFilename="${MODULE_DIR}\DxeWinNtLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\DxeWinNtLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\DxeWinNtLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DxeWinNtLib_cleanall">
-      <OutputDirSetup baseName="DxeWinNtLib" mbdFilename="${MODULE_DIR}\DxeWinNtLib.mbd" msaFilename="${MODULE_DIR}\DxeWinNtLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\DxeWinNtLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\DxeWinNtLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DxeWinNtLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.mbd b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.mbd
deleted file mode 100644
index ca083fe61d..0000000000
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkGenericBdsLib</BaseName>
-    <Guid>1ec995b2-d15b-44f6-abd2-050ea7dd37d2</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-13 17:00</Created>
-    <Modified>2006-03-23 12:01</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/build.xml b/EdkNt32Pkg/Library/EdkGenericBdsLib/build.xml
deleted file mode 100644
index ad30c96192..0000000000
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/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="EdkGenericBdsLib"><!--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="Library\EdkGenericBdsLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="EdkGenericBdsLib">
-      <GenBuild baseName="EdkGenericBdsLib" mbdFilename="${MODULE_DIR}\EdkGenericBdsLib.mbd" msaFilename="${MODULE_DIR}\EdkGenericBdsLib.msa"/>
-   </target>
-   <target depends="EdkGenericBdsLib_clean" name="clean"/>
-   <target depends="EdkGenericBdsLib_cleanall" name="cleanall"/>
-   <target name="EdkGenericBdsLib_clean">
-      <OutputDirSetup baseName="EdkGenericBdsLib" mbdFilename="${MODULE_DIR}\EdkGenericBdsLib.mbd" msaFilename="${MODULE_DIR}\EdkGenericBdsLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\EdkGenericBdsLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\EdkGenericBdsLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkGenericBdsLib_cleanall">
-      <OutputDirSetup baseName="EdkGenericBdsLib" mbdFilename="${MODULE_DIR}\EdkGenericBdsLib.mbd" msaFilename="${MODULE_DIR}\EdkGenericBdsLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\EdkGenericBdsLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\EdkGenericBdsLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkGenericBdsLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.mbd b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.mbd
deleted file mode 100644
index 8e23782db8..0000000000
--- a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkNt32PeiPeCoffGetEntryPointLib</BaseName>
-    <Guid>434b164e-5fa6-4a3d-bc04-02da2a4eeb26</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004 - 2005, 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>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/build.xml b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/build.xml
deleted file mode 100644
index c558a9b47f..0000000000
--- a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/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="EdkNt32PeiPeCoffGetEntryPointLib"><!--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="Library\EdkNt32PeiPeCoffGetEntryPointLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="EdkNt32PeiPeCoffGetEntryPointLib">
-      <GenBuild baseName="EdkNt32PeiPeCoffGetEntryPointLib" mbdFilename="${MODULE_DIR}\EdkNt32PeiPeCoffGetEntryPointLib.mbd" msaFilename="${MODULE_DIR}\EdkNt32PeiPeCoffGetEntryPointLib.msa"/>
-   </target>
-   <target depends="EdkNt32PeiPeCoffGetEntryPointLib_clean" name="clean"/>
-   <target depends="EdkNt32PeiPeCoffGetEntryPointLib_cleanall" name="cleanall"/>
-   <target name="EdkNt32PeiPeCoffGetEntryPointLib_clean">
-      <OutputDirSetup baseName="EdkNt32PeiPeCoffGetEntryPointLib" mbdFilename="${MODULE_DIR}\EdkNt32PeiPeCoffGetEntryPointLib.mbd" msaFilename="${MODULE_DIR}\EdkNt32PeiPeCoffGetEntryPointLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\EdkNt32PeiPeCoffGetEntryPointLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\EdkNt32PeiPeCoffGetEntryPointLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkNt32PeiPeCoffGetEntryPointLib_cleanall">
-      <OutputDirSetup baseName="EdkNt32PeiPeCoffGetEntryPointLib" mbdFilename="${MODULE_DIR}\EdkNt32PeiPeCoffGetEntryPointLib.mbd" msaFilename="${MODULE_DIR}\EdkNt32PeiPeCoffGetEntryPointLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\EdkNt32PeiPeCoffGetEntryPointLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\EdkNt32PeiPeCoffGetEntryPointLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkNt32PeiPeCoffGetEntryPointLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.mbd b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.mbd
deleted file mode 100644
index 233d7d3c59..0000000000
--- a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>Nt32PeCoffLoaderLib</BaseName>
-    <Guid>3c5702f2-9b17-4273-b60c-b96e6cd13066</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004 - 2005, 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-31 13:20</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/build.xml b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/build.xml
deleted file mode 100644
index 1ca1244559..0000000000
--- a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/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="Nt32PeCoffLoaderLib"><!--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="Library\Nt32PeCoffLoaderLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Nt32PeCoffLoaderLib">
-      <GenBuild baseName="Nt32PeCoffLoaderLib" mbdFilename="${MODULE_DIR}\Nt32PeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}\Nt32PeCoffLoaderLib.msa"/>
-   </target>
-   <target depends="Nt32PeCoffLoaderLib_clean" name="clean"/>
-   <target depends="Nt32PeCoffLoaderLib_cleanall" name="cleanall"/>
-   <target name="Nt32PeCoffLoaderLib_clean">
-      <OutputDirSetup baseName="Nt32PeCoffLoaderLib" mbdFilename="${MODULE_DIR}\Nt32PeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}\Nt32PeCoffLoaderLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Nt32PeCoffLoaderLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Nt32PeCoffLoaderLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Nt32PeCoffLoaderLib_cleanall">
-      <OutputDirSetup baseName="Nt32PeCoffLoaderLib" mbdFilename="${MODULE_DIR}\Nt32PeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}\Nt32PeCoffLoaderLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Nt32PeCoffLoaderLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Nt32PeCoffLoaderLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Nt32PeCoffLoaderLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Logo/Logo.mbd b/EdkNt32Pkg/Logo/Logo.mbd
deleted file mode 100644
index 346ff12fb8..0000000000
--- a/EdkNt32Pkg/Logo/Logo.mbd
+++ /dev/null
@@ -1,30 +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>Logo</BaseName>
-    <Guid>7BB28B99-61BB-11D5-9A5D-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-14 17:04</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Logo/build.xml b/EdkNt32Pkg/Logo/build.xml
deleted file mode 100644
index f9828f3cfc..0000000000
--- a/EdkNt32Pkg/Logo/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="Logo"><!--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="Logo"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Logo">
-      <GenBuild baseName="Logo" mbdFilename="${MODULE_DIR}\Logo.mbd" msaFilename="${MODULE_DIR}\Logo.msa"/>
-   </target>
-   <target depends="Logo_clean" name="clean"/>
-   <target depends="Logo_cleanall" name="cleanall"/>
-   <target name="Logo_clean">
-      <OutputDirSetup baseName="Logo" mbdFilename="${MODULE_DIR}\Logo.mbd" msaFilename="${MODULE_DIR}\Logo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Logo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Logo_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Logo_cleanall">
-      <OutputDirSetup baseName="Logo" mbdFilename="${MODULE_DIR}\Logo.mbd" msaFilename="${MODULE_DIR}\Logo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Logo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Logo_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Logo*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.mbd b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.mbd
deleted file mode 100644
index b257570559..0000000000
--- a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.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>WinNtAutoScan</BaseName>
-    <Guid>BE0FEABA-3443-4919-9F3A-2D4216329EA9</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>PeimEntryPoint</Library>
-    <Library>PeiMemoryLib</Library>
-    <Library>PeiServicesLib</Library>
-    <Library>PeiServicesTablePointerLib</Library>
-    <Library>PeiHobLib</Library>
-    <Library>PeiReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>BaseLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Pei/Autoscan/build.xml b/EdkNt32Pkg/Pei/Autoscan/build.xml
deleted file mode 100644
index bdbd4c930e..0000000000
--- a/EdkNt32Pkg/Pei/Autoscan/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="WinNtAutoScan"><!--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="Pei\Autoscan"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtAutoScan">
-      <GenBuild baseName="WinNtAutoScan" mbdFilename="${MODULE_DIR}\WinNtAutoScan.mbd" msaFilename="${MODULE_DIR}\WinNtAutoScan.msa"/>
-   </target>
-   <target depends="WinNtAutoScan_clean" name="clean"/>
-   <target depends="WinNtAutoScan_cleanall" name="cleanall"/>
-   <target name="WinNtAutoScan_clean">
-      <OutputDirSetup baseName="WinNtAutoScan" mbdFilename="${MODULE_DIR}\WinNtAutoScan.mbd" msaFilename="${MODULE_DIR}\WinNtAutoScan.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtAutoScan_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtAutoScan_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtAutoScan_cleanall">
-      <OutputDirSetup baseName="WinNtAutoScan" mbdFilename="${MODULE_DIR}\WinNtAutoScan.mbd" msaFilename="${MODULE_DIR}\WinNtAutoScan.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtAutoScan_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtAutoScan_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtAutoScan*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/BootMode/BootMode.mbd b/EdkNt32Pkg/Pei/BootMode/BootMode.mbd
deleted file mode 100644
index 3e01e9dfe4..0000000000
--- a/EdkNt32Pkg/Pei/BootMode/BootMode.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>BootMode</BaseName>
-    <Guid>B7611005-1F26-45ba-A3DB-01F39DDB2785</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>PeimEntryPoint</Library>
-    <Library>PeiMemoryLib</Library>
-    <Library>PeiServicesLib</Library>
-    <Library>PeiServicesTablePointerLib</Library>
-    <Library>PeiReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>BaseLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Pei/BootMode/build.xml b/EdkNt32Pkg/Pei/BootMode/build.xml
deleted file mode 100644
index cd67235b3a..0000000000
--- a/EdkNt32Pkg/Pei/BootMode/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="BootMode"><!--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="Pei\BootMode"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="BootMode">
-      <GenBuild baseName="BootMode" mbdFilename="${MODULE_DIR}\BootMode.mbd" msaFilename="${MODULE_DIR}\BootMode.msa"/>
-   </target>
-   <target depends="BootMode_clean" name="clean"/>
-   <target depends="BootMode_cleanall" name="cleanall"/>
-   <target name="BootMode_clean">
-      <OutputDirSetup baseName="BootMode" mbdFilename="${MODULE_DIR}\BootMode.mbd" msaFilename="${MODULE_DIR}\BootMode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\BootMode_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\BootMode_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="BootMode_cleanall">
-      <OutputDirSetup baseName="BootMode" mbdFilename="${MODULE_DIR}\BootMode.mbd" msaFilename="${MODULE_DIR}\BootMode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\BootMode_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\BootMode_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**BootMode*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.mbd b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.mbd
deleted file mode 100644
index 73667cc5d0..0000000000
--- a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.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>WinNtFwh</BaseName>
-    <Guid>F0384FFD-8633-452f-9010-F6B7D2EAE2F1</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-23 10:33</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>PeimEntryPoint</Library>
-    <Library>PeiMemoryLib</Library>
-    <Library>PeiServicesLib</Library>
-    <Library>PeiServicesTablePointerLib</Library>
-    <Library>PeiHobLib</Library>
-    <Library>PeiReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>BaseLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Pei/FirmwareVolume/build.xml b/EdkNt32Pkg/Pei/FirmwareVolume/build.xml
deleted file mode 100644
index 7aa147bb9e..0000000000
--- a/EdkNt32Pkg/Pei/FirmwareVolume/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="WinNtFwh"><!--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="Pei\FirmwareVolume"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtFwh">
-      <GenBuild baseName="WinNtFwh" mbdFilename="${MODULE_DIR}\WinNtFwh.mbd" msaFilename="${MODULE_DIR}\WinNtFwh.msa"/>
-   </target>
-   <target depends="WinNtFwh_clean" name="clean"/>
-   <target depends="WinNtFwh_cleanall" name="cleanall"/>
-   <target name="WinNtFwh_clean">
-      <OutputDirSetup baseName="WinNtFwh" mbdFilename="${MODULE_DIR}\WinNtFwh.mbd" msaFilename="${MODULE_DIR}\WinNtFwh.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtFwh_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtFwh_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtFwh_cleanall">
-      <OutputDirSetup baseName="WinNtFwh" mbdFilename="${MODULE_DIR}\WinNtFwh.mbd" msaFilename="${MODULE_DIR}\WinNtFwh.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtFwh_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtFwh_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtFwh*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd b/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd
deleted file mode 100644
index dcf185c806..0000000000
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.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>PeiFlashMap</BaseName>
-    <Guid>681F3771-6F1D-42DE-9AA2-F82BBCDBC5F9</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-23 10:43</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>PeimEntryPoint</Library>
-    <Library>PeiMemoryLib</Library>
-    <Library>PeiServicesLib</Library>
-    <Library>PeiServicesTablePointerLib</Library>
-    <Library>PeiHobLib</Library>
-    <Library>PeiReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>BaseLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Pei/FlashMap/build.xml b/EdkNt32Pkg/Pei/FlashMap/build.xml
deleted file mode 100644
index b388551a3a..0000000000
--- a/EdkNt32Pkg/Pei/FlashMap/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="PeiFlashMap"><!--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="Pei\FlashMap"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="PeiFlashMap">
-      <GenBuild baseName="PeiFlashMap" mbdFilename="${MODULE_DIR}\FlashMap.mbd" msaFilename="${MODULE_DIR}\FlashMap.msa"/>
-   </target>
-   <target depends="PeiFlashMap_clean" name="clean"/>
-   <target depends="PeiFlashMap_cleanall" name="cleanall"/>
-   <target name="PeiFlashMap_clean">
-      <OutputDirSetup baseName="PeiFlashMap" mbdFilename="${MODULE_DIR}\FlashMap.mbd" msaFilename="${MODULE_DIR}\FlashMap.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\PeiFlashMap_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\PeiFlashMap_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="PeiFlashMap_cleanall">
-      <OutputDirSetup baseName="PeiFlashMap" mbdFilename="${MODULE_DIR}\FlashMap.mbd" msaFilename="${MODULE_DIR}\FlashMap.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\PeiFlashMap_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\PeiFlashMap_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**PeiFlashMap*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.mbd b/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.mbd
deleted file mode 100644
index 0b685338be..0000000000
--- a/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.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>MonoStatusCode</BaseName>
-    <Guid>1501614E-0E6C-4ef4-8B8F-C276CDFB646F</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>PeiReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>BaseLib</Library>
-    <Library>PeiMemoryLib</Library>
-    <Library>PeiServicesTablePointerLib</Library>
-    <Library>PeiHobLib</Library>
-    <Library>PeimEntryPoint</Library>
-    <Library>EdkMemoryStatusCodeLib</Library>
-    <Library>PeiServicesLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Pei/MonoStatusCode/build.xml b/EdkNt32Pkg/Pei/MonoStatusCode/build.xml
deleted file mode 100644
index bff195ac0d..0000000000
--- a/EdkNt32Pkg/Pei/MonoStatusCode/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="MonoStatusCode"><!--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="Pei\MonoStatusCode"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="MonoStatusCode">
-      <GenBuild baseName="MonoStatusCode" mbdFilename="${MODULE_DIR}\MonoStatusCode.mbd" msaFilename="${MODULE_DIR}\MonoStatusCode.msa"/>
-   </target>
-   <target depends="MonoStatusCode_clean" name="clean"/>
-   <target depends="MonoStatusCode_cleanall" name="cleanall"/>
-   <target name="MonoStatusCode_clean">
-      <OutputDirSetup baseName="MonoStatusCode" mbdFilename="${MODULE_DIR}\MonoStatusCode.mbd" msaFilename="${MODULE_DIR}\MonoStatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\MonoStatusCode_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\MonoStatusCode_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="MonoStatusCode_cleanall">
-      <OutputDirSetup baseName="MonoStatusCode" mbdFilename="${MODULE_DIR}\MonoStatusCode.mbd" msaFilename="${MODULE_DIR}\MonoStatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\MonoStatusCode_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\MonoStatusCode_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**MonoStatusCode*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.mbd b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.mbd
deleted file mode 100644
index 49465980dc..0000000000
--- a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.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>WinNtStuff</BaseName>
-    <Guid>D3AAD8DC-3A48-46ac-B1C7-28A9D3CF6755</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>PeimEntryPoint</Library>
-    <Library>PeiMemoryLib</Library>
-    <Library>PeiServicesLib</Library>
-    <Library>PeiServicesTablePointerLib</Library>
-    <Library>PeiHobLib</Library>
-    <Library>PeiReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>BaseLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Pei/WinNtStuff/build.xml b/EdkNt32Pkg/Pei/WinNtStuff/build.xml
deleted file mode 100644
index 885bacb1a2..0000000000
--- a/EdkNt32Pkg/Pei/WinNtStuff/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="WinNtStuff"><!--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="Pei\WinNtStuff"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtStuff">
-      <GenBuild baseName="WinNtStuff" mbdFilename="${MODULE_DIR}\WinNtStuff.mbd" msaFilename="${MODULE_DIR}\WinNtStuff.msa"/>
-   </target>
-   <target depends="WinNtStuff_clean" name="clean"/>
-   <target depends="WinNtStuff_cleanall" name="cleanall"/>
-   <target name="WinNtStuff_clean">
-      <OutputDirSetup baseName="WinNtStuff" mbdFilename="${MODULE_DIR}\WinNtStuff.mbd" msaFilename="${MODULE_DIR}\WinNtStuff.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtStuff_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtStuff_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtStuff_cleanall">
-      <OutputDirSetup baseName="WinNtStuff" mbdFilename="${MODULE_DIR}\WinNtStuff.mbd" msaFilename="${MODULE_DIR}\WinNtStuff.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtStuff_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtStuff_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtStuff*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.mbd b/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.mbd
deleted file mode 100644
index 7f83760ff2..0000000000
--- a/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.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>FwBlockService</BaseName>
-    <Guid>BDFE5FAA-2A35-44bb-B17A-8084D4E2B9E9</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>BaseMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>DxeServicesTableLib</Library>
-    <Library>BaseDebugLibNull</Library>
-    <Library>EdkDxePrintLib</Library>
-    <Library>EdkDxeRuntimeDriverLib</Library>
-    <Library>DxeHobLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/RuntimeDxe/FvbServices/build.xml b/EdkNt32Pkg/RuntimeDxe/FvbServices/build.xml
deleted file mode 100644
index 60d06c448b..0000000000
--- a/EdkNt32Pkg/RuntimeDxe/FvbServices/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="FwBlockService"><!--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="RuntimeDxe\FvbServices"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="FwBlockService">
-      <GenBuild baseName="FwBlockService" mbdFilename="${MODULE_DIR}\Nt32Fwh.mbd" msaFilename="${MODULE_DIR}\Nt32Fwh.msa"/>
-   </target>
-   <target depends="FwBlockService_clean" name="clean"/>
-   <target depends="FwBlockService_cleanall" name="cleanall"/>
-   <target name="FwBlockService_clean">
-      <OutputDirSetup baseName="FwBlockService" mbdFilename="${MODULE_DIR}\Nt32Fwh.mbd" msaFilename="${MODULE_DIR}\Nt32Fwh.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\FwBlockService_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\FwBlockService_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="FwBlockService_cleanall">
-      <OutputDirSetup baseName="FwBlockService" mbdFilename="${MODULE_DIR}\Nt32Fwh.mbd" msaFilename="${MODULE_DIR}\Nt32Fwh.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\FwBlockService_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\FwBlockService_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**FwBlockService*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/Sec/SecMain.mbd b/EdkNt32Pkg/Sec/SecMain.mbd
deleted file mode 100644
index f310571a7c..0000000000
--- a/EdkNt32Pkg/Sec/SecMain.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>SecMain</BaseName>
-    <Guid>4b837b03-6587-4d19-b82b-edfad836c0a0</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>BaseLib</Library>
-    <Library>BaseMemoryLib</Library>
-    <Library>BasePeCoffLib</Library>
-    <Library>BasePrintLib</Library>
-    <Library>BaseReportStatusCodeLibNull</Library>
-    <Library>BaseDebugLibNull</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Sec/build.xml b/EdkNt32Pkg/Sec/build.xml
deleted file mode 100644
index 4140a8ab0f..0000000000
--- a/EdkNt32Pkg/Sec/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="SecMain"><!--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="Sec"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="SecMain">
-      <GenBuild baseName="SecMain" mbdFilename="${MODULE_DIR}\SecMain.mbd" msaFilename="${MODULE_DIR}\SecMain.msa"/>
-   </target>
-   <target depends="SecMain_clean" name="clean"/>
-   <target depends="SecMain_cleanall" name="cleanall"/>
-   <target name="SecMain_clean">
-      <OutputDirSetup baseName="SecMain" mbdFilename="${MODULE_DIR}\SecMain.mbd" msaFilename="${MODULE_DIR}\SecMain.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\SecMain_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\SecMain_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="SecMain_cleanall">
-      <OutputDirSetup baseName="SecMain" mbdFilename="${MODULE_DIR}\SecMain.mbd" msaFilename="${MODULE_DIR}\SecMain.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\SecMain_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\SecMain_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**SecMain*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkNt32Pkg/build.xml b/EdkNt32Pkg/build.xml
deleted file mode 100644
index d6ca4b81b5..0000000000
--- a/EdkNt32Pkg/build.xml
+++ /dev/null
@@ -1,105 +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 default="buildfpd" basedir=".">
-  <!-- Apply external ANT tasks -->
-  <taskdef resource="net/sf/antcontrib/antlib.xml" />
-  <taskdef resource="GenBuild.tasks" />
-  
-  <property environment="env" />  
-  <property name="WORKSPACE_DIR" value="${env.WORKSPACE}" />
-  <property name="PLATFORM" value="NT32" />
-  <property name="PLATFORM_DIR" value="${WORKSPACE_DIR}\EdkNt32Pkg" />
-  <property name="BUILD_MODE" value="PLATFORM" />
-  <property name="COMMON_FILE" value="${PLATFORM_DIR}\Build\Nt32Common.xml" />  
-  
-  <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml" />
-  
-  <target name="buildfpd" depends="init, fpdparser, builds, fds" />
-  
-  <target name="init">
-    <if>
-      <not>
-        <isset property="env.WORKSPACE" />
-      </not>
-      <then>
-        <fail message="WORKSPACE environmental variable not set." />
-      </then>
-    </if>
-    <ToolChainSetup confPath="${WORKSPACE_DIR}\Tools\Conf" />
-  </target>
-
-  <target name="tools">
-    <ant antfile="${WORKSPACE_DIR}\Tools\Source\TianoTools\build.xml" />
-  </target>
-  
-  <target name="fpdparser" unless="FPD_File">
-    <FPDParser fpdfilename="Nt32.fpd" />
-  </target>
-  
-  <target name="builds" depends="fpdparser">
-    <ant antfile="${PLATFORM_DIR}\build.out.xml" />
-  </target>
-  
-  <target name="fds" depends="builds">
-    <concat destfile="${PLATFORM_DIR}\Build\FV\FV_RECOVERY.fd" binary="true" >
-      <fileset dir="${PLATFORM_DIR}\Build\FV" includes="*.fv" />
-    </concat>
-  </target>
-
-  <!-- this is only needed for Nt32 target exe generation --> 
-  <target name="run">
-    <if>
-      <available file="${WORKSPACE_DIR}\EdkNt32Pkg\Build\DEBUG\IA32\SecMain.exe" />
-      <then>
-        <shellscript shell="cmd.exe" tmpsuffix=".bat">
-          <arg value="/c"/>
-          <arg value="call"/>
-          cd ${WORKSPACE_DIR}\EdkNt32Pkg\Build\DEBUG\IA32
-          SecMain.exe
-        </shellscript>
-      </then>
-      <else>
-        <echo message="#################################################################"/>
-        <echo message="#################################################################"/>
-        <echo message="#"/>
-        <echo message="#  You must build the executable first, just type ant"/>
-        <echo message="#"/>
-        <echo message="#################################################################"/>
-        <echo message="#################################################################"/>
-      </else>
-    </if>
-  </target>
-
-  <!-- clean. -->
-  <target name="clean" depends="init">
-    <if>
-      <available file="${PLATFORM_DIR}\build.out.xml" />
-      <then>
-        <ant antfile="${PLATFORM_DIR}\build.out.xml" target="clean" />
-      </then>
-    </if>
-  </target>
-  
-  <!-- clean All. -->
-  <target name="cleanall" depends="init">
-    <if>
-      <available file="${PLATFORM_DIR}\build.out.xml" />
-      <then>
-        <ant antfile="${PLATFORM_DIR}\build.out.xml" target="cleanall" />
-        <delete file="${PLATFORM_DIR}\build.out.xml" />
-      </then>
-    </if>
-    <delete dir="${PLATFORM_DIR}\Build\FV" />
-  </target>
-  
-</project>
diff --git a/EdkNt32Pkg/genbuildfile.xml b/EdkNt32Pkg/genbuildfile.xml
deleted file mode 100644
index 77702ef12d..0000000000
--- a/EdkNt32Pkg/genbuildfile.xml
+++ /dev/null
@@ -1,19 +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 default="workspace" basedir=".">
-  <taskdef resource="GenBuild.tasks" />
-  
-  <target name="workspace">
-    <bf recursive="true" />
-  </target>
-</project>
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 /EdkNt32Pkg
parent	f46d7c213b49f97e68d6339aa9df3f70b15d9b59 (diff)
download	edk2-44050d53afe3a38812977a3e8f5f2860237a3690.tar.gz edk2-44050d53afe3a38812977a3e8f5f2860237a3690.tar.bz2 edk2-44050d53afe3a38812977a3e8f5f2860237a3690.zip