Convert backslashes to forward slashes in many build files. This is necessary for Linux support.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@55 6f19259b-4bc3-4df7-8a09-765794883524

159 files changed, 2070 insertions, 2070 deletions

diff --git a/EdkFatBinPkg/build.xml b/EdkFatBinPkg/build.xml
index e3d4dc4e95..d26c5fd50c 100644
--- a/EdkFatBinPkg/build.xml
+++ b/EdkFatBinPkg/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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-->

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

    <property name="MODULE_RELATIVE_PATH" value="."/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Fat">

-      <GenBuild baseName="Fat" mbdFilename="${MODULE_DIR}\Fat.mbd" msaFilename="${MODULE_DIR}\Fat.msa"/>

+      <GenBuild baseName="Fat" mbdFilename="${MODULE_DIR}/Fat.mbd" msaFilename="${MODULE_DIR}/Fat.msa"/>

    </target>

    <target depends="Fat_clean" name="clean"/>

    <target depends="Fat_cleanall" name="cleanall"/>

    <target name="Fat_clean">

-      <OutputDirSetup baseName="Fat" mbdFilename="${MODULE_DIR}\Fat.mbd" msaFilename="${MODULE_DIR}\Fat.msa"/>

+      <OutputDirSetup baseName="Fat" mbdFilename="${MODULE_DIR}/Fat.mbd" msaFilename="${MODULE_DIR}/Fat.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Fat_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Fat_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Fat_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Fat_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Fat_cleanall">

-      <OutputDirSetup baseName="Fat" mbdFilename="${MODULE_DIR}\Fat.mbd" msaFilename="${MODULE_DIR}\Fat.msa"/>

+      <OutputDirSetup baseName="Fat" mbdFilename="${MODULE_DIR}/Fat.mbd" msaFilename="${MODULE_DIR}/Fat.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Fat_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Fat_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Fat_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Fat_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Application/HelloWorld/build.xml b/EdkModulePkg/Application/HelloWorld/build.xml
index d8531c33e2..19519f86f8 100644
--- a/EdkModulePkg/Application/HelloWorld/build.xml
+++ b/EdkModulePkg/Application/HelloWorld/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Application\HelloWorld"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Application/HelloWorld"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="HelloWorld">

-      <GenBuild baseName="HelloWorld" mbdFilename="${MODULE_DIR}\HelloWorld.mbd" msaFilename="${MODULE_DIR}\HelloWorld.msa"/>

+      <GenBuild baseName="HelloWorld" mbdFilename="${MODULE_DIR}/HelloWorld.mbd" msaFilename="${MODULE_DIR}/HelloWorld.msa"/>

    </target>

    <target depends="HelloWorld_clean" name="clean"/>

    <target depends="HelloWorld_cleanall" name="cleanall"/>

    <target name="HelloWorld_clean">

-      <OutputDirSetup baseName="HelloWorld" mbdFilename="${MODULE_DIR}\HelloWorld.mbd" msaFilename="${MODULE_DIR}\HelloWorld.msa"/>

+      <OutputDirSetup baseName="HelloWorld" mbdFilename="${MODULE_DIR}/HelloWorld.mbd" msaFilename="${MODULE_DIR}/HelloWorld.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\HelloWorld_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/HelloWorld_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\HelloWorld_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/HelloWorld_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="HelloWorld_cleanall">

-      <OutputDirSetup baseName="HelloWorld" mbdFilename="${MODULE_DIR}\HelloWorld.mbd" msaFilename="${MODULE_DIR}\HelloWorld.msa"/>

+      <OutputDirSetup baseName="HelloWorld" mbdFilename="${MODULE_DIR}/HelloWorld.mbd" msaFilename="${MODULE_DIR}/HelloWorld.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\HelloWorld_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/HelloWorld_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\HelloWorld_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/HelloWorld_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/build.xml b/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/build.xml
index d9b2b666b2..3d80c2c6aa 100644
--- a/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Pci\AtapiPassThru\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/AtapiPassThru/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="AtapiPassThru">

-      <GenBuild baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}\AtapiPassThru.mbd" msaFilename="${MODULE_DIR}\AtapiPassThru.msa"/>

+      <GenBuild baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}/AtapiPassThru.mbd" msaFilename="${MODULE_DIR}/AtapiPassThru.msa"/>

    </target>

    <target depends="AtapiPassThru_clean" name="clean"/>

    <target depends="AtapiPassThru_cleanall" name="cleanall"/>

    <target name="AtapiPassThru_clean">

-      <OutputDirSetup baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}\AtapiPassThru.mbd" msaFilename="${MODULE_DIR}\AtapiPassThru.msa"/>

+      <OutputDirSetup baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}/AtapiPassThru.mbd" msaFilename="${MODULE_DIR}/AtapiPassThru.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\AtapiPassThru_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/AtapiPassThru_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\AtapiPassThru_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/AtapiPassThru_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="AtapiPassThru_cleanall">

-      <OutputDirSetup baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}\AtapiPassThru.mbd" msaFilename="${MODULE_DIR}\AtapiPassThru.msa"/>

+      <OutputDirSetup baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}/AtapiPassThru.mbd" msaFilename="${MODULE_DIR}/AtapiPassThru.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\AtapiPassThru_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/AtapiPassThru_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\AtapiPassThru_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/AtapiPassThru_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/build.xml b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/build.xml
index c8e44b1e6c..fb6ce8c123 100644
--- a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Pci\CirrusLogic\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/CirrusLogic/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="CirrusLogic5430UgaDraw">

-      <GenBuild baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}\CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}\CirrusLogic5430.msa"/>

+      <GenBuild baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}/CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}/CirrusLogic5430.msa"/>

    </target>

    <target depends="CirrusLogic5430UgaDraw_clean" name="clean"/>

    <target depends="CirrusLogic5430UgaDraw_cleanall" name="cleanall"/>

    <target name="CirrusLogic5430UgaDraw_clean">

-      <OutputDirSetup baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}\CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}\CirrusLogic5430.msa"/>

+      <OutputDirSetup baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}/CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}/CirrusLogic5430.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\CirrusLogic5430UgaDraw_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/CirrusLogic5430UgaDraw_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\CirrusLogic5430UgaDraw_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/CirrusLogic5430UgaDraw_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="CirrusLogic5430UgaDraw_cleanall">

-      <OutputDirSetup baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}\CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}\CirrusLogic5430.msa"/>

+      <OutputDirSetup baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}/CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}/CirrusLogic5430.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\CirrusLogic5430UgaDraw_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/CirrusLogic5430UgaDraw_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\CirrusLogic5430UgaDraw_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/CirrusLogic5430UgaDraw_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/build.xml b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/build.xml
index 3a33a2b3a9..5f6d8292cc 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/build.xml
@@ -11,44 +11,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Pci\IdeBus\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/IdeBus/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="IdeBusLite">

-      <GenBuild baseName="IdeBusLite" mbdFilename="${MODULE_DIR}\idebusLite.mbd" msaFilename="${MODULE_DIR}\idebusLite.msa"/>

+      <GenBuild baseName="IdeBusLite" mbdFilename="${MODULE_DIR}/idebusLite.mbd" msaFilename="${MODULE_DIR}/idebusLite.msa"/>

    </target>

    <target name="IdeBus">

-      <GenBuild baseName="IdeBus" mbdFilename="${MODULE_DIR}\idebus.mbd" msaFilename="${MODULE_DIR}\idebus.msa"/>

+      <GenBuild baseName="IdeBus" mbdFilename="${MODULE_DIR}/idebus.mbd" msaFilename="${MODULE_DIR}/idebus.msa"/>

    </target>

    <target depends="IdeBus_clean" name="clean"/>

    <target depends="IdeBus_cleanall" name="cleanall"/>

    <target name="IdeBusLite_clean">

-      <OutputDirSetup baseName="IdeBusLite" mbdFilename="${MODULE_DIR}\idebusLite.mbd" msaFilename="${MODULE_DIR}\idebusLite.msa"/>

+      <OutputDirSetup baseName="IdeBusLite" mbdFilename="${MODULE_DIR}/idebusLite.mbd" msaFilename="${MODULE_DIR}/idebusLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\IdeBusLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/IdeBusLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\IdeBusLite_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/IdeBusLite_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="IdeBus_clean">

-      <OutputDirSetup baseName="IdeBus" mbdFilename="${MODULE_DIR}\idebus.mbd" msaFilename="${MODULE_DIR}\idebus.msa"/>

+      <OutputDirSetup baseName="IdeBus" mbdFilename="${MODULE_DIR}/idebus.mbd" msaFilename="${MODULE_DIR}/idebus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\IdeBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/IdeBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\IdeBus_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/IdeBus_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="IdeBusLite_cleanall">

-      <OutputDirSetup baseName="IdeBusLite" mbdFilename="${MODULE_DIR}\idebusLite.mbd" msaFilename="${MODULE_DIR}\idebusLite.msa"/>

+      <OutputDirSetup baseName="IdeBusLite" mbdFilename="${MODULE_DIR}/idebusLite.mbd" msaFilename="${MODULE_DIR}/idebusLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\IdeBusLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/IdeBusLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\IdeBusLite_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/IdeBusLite_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

@@ -58,11 +58,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
       </delete>

    </target>

    <target name="IdeBus_cleanall">

-      <OutputDirSetup baseName="IdeBus" mbdFilename="${MODULE_DIR}\idebus.mbd" msaFilename="${MODULE_DIR}\idebus.msa"/>

+      <OutputDirSetup baseName="IdeBus" mbdFilename="${MODULE_DIR}/idebus.mbd" msaFilename="${MODULE_DIR}/idebus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\IdeBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/IdeBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\IdeBus_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/IdeBus_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/build.xml b/EdkModulePkg/Bus/Pci/PciBus/Dxe/build.xml
index ee051c7231..579dc7fb6b 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/build.xml
@@ -11,57 +11,57 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Pci\PciBus\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/PciBus/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PciBus">

-      <GenBuild baseName="PciBus" mbdFilename="${MODULE_DIR}\PciBus.mbd" msaFilename="${MODULE_DIR}\PciBus.msa"/>

+      <GenBuild baseName="PciBus" mbdFilename="${MODULE_DIR}/PciBus.mbd" msaFilename="${MODULE_DIR}/PciBus.msa"/>

    </target>

    <target name="LightPciBusPciBus">

-      <GenBuild baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}\LightPciBus.mbd" msaFilename="${MODULE_DIR}\LightPciBus.msa"/>

+      <GenBuild baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}/LightPciBus.mbd" msaFilename="${MODULE_DIR}/LightPciBus.msa"/>

    </target>

    <target name="PciBusPciBusLite">

-      <GenBuild baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}\PciBusLite.mbd" msaFilename="${MODULE_DIR}\PciBusLite.msa"/>

+      <GenBuild baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}/PciBusLite.mbd" msaFilename="${MODULE_DIR}/PciBusLite.msa"/>

    </target>

    <target depends="PciBus_clean" name="clean"/>

    <target depends="PciBus_cleanall" name="cleanall"/>

    <target name="PciBus_clean">

-      <OutputDirSetup baseName="PciBus" mbdFilename="${MODULE_DIR}\PciBus.mbd" msaFilename="${MODULE_DIR}\PciBus.msa"/>

+      <OutputDirSetup baseName="PciBus" mbdFilename="${MODULE_DIR}/PciBus.mbd" msaFilename="${MODULE_DIR}/PciBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PciBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PciBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PciBus_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PciBus_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="LightPciBusPciBus_clean">

-      <OutputDirSetup baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}\LightPciBus.mbd" msaFilename="${MODULE_DIR}\LightPciBus.msa"/>

+      <OutputDirSetup baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}/LightPciBus.mbd" msaFilename="${MODULE_DIR}/LightPciBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\LightPciBusPciBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/LightPciBusPciBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\LightPciBusPciBus_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/LightPciBusPciBus_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PciBusPciBusLite_clean">

-      <OutputDirSetup baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}\PciBusLite.mbd" msaFilename="${MODULE_DIR}\PciBusLite.msa"/>

+      <OutputDirSetup baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}/PciBusLite.mbd" msaFilename="${MODULE_DIR}/PciBusLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PciBusPciBusLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PciBusPciBusLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PciBusPciBusLite_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PciBusPciBusLite_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PciBus_cleanall">

-      <OutputDirSetup baseName="PciBus" mbdFilename="${MODULE_DIR}\PciBus.mbd" msaFilename="${MODULE_DIR}\PciBus.msa"/>

+      <OutputDirSetup baseName="PciBus" mbdFilename="${MODULE_DIR}/PciBus.mbd" msaFilename="${MODULE_DIR}/PciBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PciBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PciBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PciBus_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PciBus_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

@@ -71,11 +71,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
       </delete>

    </target>

    <target name="LightPciBusPciBus_cleanall">

-      <OutputDirSetup baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}\LightPciBus.mbd" msaFilename="${MODULE_DIR}\LightPciBus.msa"/>

+      <OutputDirSetup baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}/LightPciBus.mbd" msaFilename="${MODULE_DIR}/LightPciBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\LightPciBusPciBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/LightPciBusPciBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\LightPciBusPciBus_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/LightPciBusPciBus_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

@@ -85,11 +85,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
       </delete>

    </target>

    <target name="PciBusPciBusLite_cleanall">

-      <OutputDirSetup baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}\PciBusLite.mbd" msaFilename="${MODULE_DIR}\PciBusLite.msa"/>

+      <OutputDirSetup baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}/PciBusLite.mbd" msaFilename="${MODULE_DIR}/PciBusLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PciBusPciBusLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PciBusPciBusLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PciBusPciBusLite_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PciBusPciBusLite_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Pci/Uhci/Dxe/build.xml b/EdkModulePkg/Bus/Pci/Uhci/Dxe/build.xml
index 37bb3c32e6..dca737fde4 100644
--- a/EdkModulePkg/Bus/Pci/Uhci/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/Uhci/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Pci\Uhci\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/Uhci/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Uhci">

-      <GenBuild baseName="Uhci" mbdFilename="${MODULE_DIR}\Uhci.mbd" msaFilename="${MODULE_DIR}\Uhci.msa"/>

+      <GenBuild baseName="Uhci" mbdFilename="${MODULE_DIR}/Uhci.mbd" msaFilename="${MODULE_DIR}/Uhci.msa"/>

    </target>

    <target depends="Uhci_clean" name="clean"/>

    <target depends="Uhci_cleanall" name="cleanall"/>

    <target name="Uhci_clean">

-      <OutputDirSetup baseName="Uhci" mbdFilename="${MODULE_DIR}\Uhci.mbd" msaFilename="${MODULE_DIR}\Uhci.msa"/>

+      <OutputDirSetup baseName="Uhci" mbdFilename="${MODULE_DIR}/Uhci.mbd" msaFilename="${MODULE_DIR}/Uhci.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Uhci_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Uhci_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Uhci_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Uhci_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Uhci_cleanall">

-      <OutputDirSetup baseName="Uhci" mbdFilename="${MODULE_DIR}\Uhci.mbd" msaFilename="${MODULE_DIR}\Uhci.msa"/>

+      <OutputDirSetup baseName="Uhci" mbdFilename="${MODULE_DIR}/Uhci.mbd" msaFilename="${MODULE_DIR}/Uhci.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Uhci_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Uhci_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Uhci_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Uhci_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/build.xml b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/build.xml
index 2375cd7820..9f34e4499b 100644
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Pci\Undi\RuntimeDxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/Undi/RuntimeDxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Undi">

-      <GenBuild baseName="Undi" mbdFilename="${MODULE_DIR}\Undi.mbd" msaFilename="${MODULE_DIR}\Undi.msa"/>

+      <GenBuild baseName="Undi" mbdFilename="${MODULE_DIR}/Undi.mbd" msaFilename="${MODULE_DIR}/Undi.msa"/>

    </target>

    <target depends="Undi_clean" name="clean"/>

    <target depends="Undi_cleanall" name="cleanall"/>

    <target name="Undi_clean">

-      <OutputDirSetup baseName="Undi" mbdFilename="${MODULE_DIR}\Undi.mbd" msaFilename="${MODULE_DIR}\Undi.msa"/>

+      <OutputDirSetup baseName="Undi" mbdFilename="${MODULE_DIR}/Undi.mbd" msaFilename="${MODULE_DIR}/Undi.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Undi_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Undi_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Undi_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Undi_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Undi_cleanall">

-      <OutputDirSetup baseName="Undi" mbdFilename="${MODULE_DIR}\Undi.mbd" msaFilename="${MODULE_DIR}\Undi.msa"/>

+      <OutputDirSetup baseName="Undi" mbdFilename="${MODULE_DIR}/Undi.mbd" msaFilename="${MODULE_DIR}/Undi.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Undi_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Undi_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Undi_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Undi_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/build.xml b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/build.xml
index 9942471bb9..a132025823 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Scsi\ScsiBus\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Scsi/ScsiBus/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="ScsiBus">

-      <GenBuild baseName="ScsiBus" mbdFilename="${MODULE_DIR}\ScsiBus.mbd" msaFilename="${MODULE_DIR}\ScsiBus.msa"/>

+      <GenBuild baseName="ScsiBus" mbdFilename="${MODULE_DIR}/ScsiBus.mbd" msaFilename="${MODULE_DIR}/ScsiBus.msa"/>

    </target>

    <target depends="ScsiBus_clean" name="clean"/>

    <target depends="ScsiBus_cleanall" name="cleanall"/>

    <target name="ScsiBus_clean">

-      <OutputDirSetup baseName="ScsiBus" mbdFilename="${MODULE_DIR}\ScsiBus.mbd" msaFilename="${MODULE_DIR}\ScsiBus.msa"/>

+      <OutputDirSetup baseName="ScsiBus" mbdFilename="${MODULE_DIR}/ScsiBus.mbd" msaFilename="${MODULE_DIR}/ScsiBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ScsiBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ScsiBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ScsiBus_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ScsiBus_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="ScsiBus_cleanall">

-      <OutputDirSetup baseName="ScsiBus" mbdFilename="${MODULE_DIR}\ScsiBus.mbd" msaFilename="${MODULE_DIR}\ScsiBus.msa"/>

+      <OutputDirSetup baseName="ScsiBus" mbdFilename="${MODULE_DIR}/ScsiBus.mbd" msaFilename="${MODULE_DIR}/ScsiBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ScsiBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ScsiBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ScsiBus_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ScsiBus_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/build.xml b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/build.xml
index 5d5f4d83b7..41178570fc 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Scsi\ScsiDisk\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Scsi/ScsiDisk/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="ScsiDisk">

-      <GenBuild baseName="ScsiDisk" mbdFilename="${MODULE_DIR}\ScsiDisk.mbd" msaFilename="${MODULE_DIR}\ScsiDisk.msa"/>

+      <GenBuild baseName="ScsiDisk" mbdFilename="${MODULE_DIR}/ScsiDisk.mbd" msaFilename="${MODULE_DIR}/ScsiDisk.msa"/>

    </target>

    <target depends="ScsiDisk_clean" name="clean"/>

    <target depends="ScsiDisk_cleanall" name="cleanall"/>

    <target name="ScsiDisk_clean">

-      <OutputDirSetup baseName="ScsiDisk" mbdFilename="${MODULE_DIR}\ScsiDisk.mbd" msaFilename="${MODULE_DIR}\ScsiDisk.msa"/>

+      <OutputDirSetup baseName="ScsiDisk" mbdFilename="${MODULE_DIR}/ScsiDisk.mbd" msaFilename="${MODULE_DIR}/ScsiDisk.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ScsiDisk_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ScsiDisk_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ScsiDisk_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ScsiDisk_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="ScsiDisk_cleanall">

-      <OutputDirSetup baseName="ScsiDisk" mbdFilename="${MODULE_DIR}\ScsiDisk.mbd" msaFilename="${MODULE_DIR}\ScsiDisk.msa"/>

+      <OutputDirSetup baseName="ScsiDisk" mbdFilename="${MODULE_DIR}/ScsiDisk.mbd" msaFilename="${MODULE_DIR}/ScsiDisk.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ScsiDisk_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ScsiDisk_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ScsiDisk_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ScsiDisk_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/build.xml b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/build.xml
index aab054b222..905ca3002b 100644
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Usb\UsbBot\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbBot/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbBot">

-      <GenBuild baseName="UsbBot" mbdFilename="${MODULE_DIR}\UsbBot.mbd" msaFilename="${MODULE_DIR}\UsbBot.msa"/>

+      <GenBuild baseName="UsbBot" mbdFilename="${MODULE_DIR}/UsbBot.mbd" msaFilename="${MODULE_DIR}/UsbBot.msa"/>

    </target>

    <target depends="UsbBot_clean" name="clean"/>

    <target depends="UsbBot_cleanall" name="cleanall"/>

    <target name="UsbBot_clean">

-      <OutputDirSetup baseName="UsbBot" mbdFilename="${MODULE_DIR}\UsbBot.mbd" msaFilename="${MODULE_DIR}\UsbBot.msa"/>

+      <OutputDirSetup baseName="UsbBot" mbdFilename="${MODULE_DIR}/UsbBot.mbd" msaFilename="${MODULE_DIR}/UsbBot.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbBot_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbBot_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbBot_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbBot_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbBot_cleanall">

-      <OutputDirSetup baseName="UsbBot" mbdFilename="${MODULE_DIR}\UsbBot.mbd" msaFilename="${MODULE_DIR}\UsbBot.msa"/>

+      <OutputDirSetup baseName="UsbBot" mbdFilename="${MODULE_DIR}/UsbBot.mbd" msaFilename="${MODULE_DIR}/UsbBot.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbBot_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbBot_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbBot_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbBot_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/build.xml b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/build.xml
index 508c7582b3..e979dab079 100644
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Usb\UsbBus\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbBus/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbBus">

-      <GenBuild baseName="UsbBus" mbdFilename="${MODULE_DIR}\UsbBus.mbd" msaFilename="${MODULE_DIR}\UsbBus.msa"/>

+      <GenBuild baseName="UsbBus" mbdFilename="${MODULE_DIR}/UsbBus.mbd" msaFilename="${MODULE_DIR}/UsbBus.msa"/>

    </target>

    <target depends="UsbBus_clean" name="clean"/>

    <target depends="UsbBus_cleanall" name="cleanall"/>

    <target name="UsbBus_clean">

-      <OutputDirSetup baseName="UsbBus" mbdFilename="${MODULE_DIR}\UsbBus.mbd" msaFilename="${MODULE_DIR}\UsbBus.msa"/>

+      <OutputDirSetup baseName="UsbBus" mbdFilename="${MODULE_DIR}/UsbBus.mbd" msaFilename="${MODULE_DIR}/UsbBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbBus_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbBus_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbBus_cleanall">

-      <OutputDirSetup baseName="UsbBus" mbdFilename="${MODULE_DIR}\UsbBus.mbd" msaFilename="${MODULE_DIR}\UsbBus.msa"/>

+      <OutputDirSetup baseName="UsbBus" mbdFilename="${MODULE_DIR}/UsbBus.mbd" msaFilename="${MODULE_DIR}/UsbBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbBus_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbBus_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/build.xml b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/build.xml
index e406abee8b..7ffd6f1ec9 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Usb\UsbCbi\Dxe\Cbi0"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbCbi/Dxe/Cbi0"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbCbi0">

-      <GenBuild baseName="UsbCbi0" mbdFilename="${MODULE_DIR}\UsbCbi0.mbd" msaFilename="${MODULE_DIR}\UsbCbi0.msa"/>

+      <GenBuild baseName="UsbCbi0" mbdFilename="${MODULE_DIR}/UsbCbi0.mbd" msaFilename="${MODULE_DIR}/UsbCbi0.msa"/>

    </target>

    <target depends="UsbCbi0_clean" name="clean"/>

    <target depends="UsbCbi0_cleanall" name="cleanall"/>

    <target name="UsbCbi0_clean">

-      <OutputDirSetup baseName="UsbCbi0" mbdFilename="${MODULE_DIR}\UsbCbi0.mbd" msaFilename="${MODULE_DIR}\UsbCbi0.msa"/>

+      <OutputDirSetup baseName="UsbCbi0" mbdFilename="${MODULE_DIR}/UsbCbi0.mbd" msaFilename="${MODULE_DIR}/UsbCbi0.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbCbi0_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbCbi0_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbCbi0_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbCbi0_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbCbi0_cleanall">

-      <OutputDirSetup baseName="UsbCbi0" mbdFilename="${MODULE_DIR}\UsbCbi0.mbd" msaFilename="${MODULE_DIR}\UsbCbi0.msa"/>

+      <OutputDirSetup baseName="UsbCbi0" mbdFilename="${MODULE_DIR}/UsbCbi0.mbd" msaFilename="${MODULE_DIR}/UsbCbi0.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbCbi0_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbCbi0_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbCbi0_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbCbi0_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/build.xml b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/build.xml
index 132e52237c..129dab1926 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Usb\UsbCbi\Dxe\Cbi1"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbCbi/Dxe/Cbi1"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbCbi1">

-      <GenBuild baseName="UsbCbi1" mbdFilename="${MODULE_DIR}\UsbCbi1.mbd" msaFilename="${MODULE_DIR}\UsbCbi1.msa"/>

+      <GenBuild baseName="UsbCbi1" mbdFilename="${MODULE_DIR}/UsbCbi1.mbd" msaFilename="${MODULE_DIR}/UsbCbi1.msa"/>

    </target>

    <target depends="UsbCbi1_clean" name="clean"/>

    <target depends="UsbCbi1_cleanall" name="cleanall"/>

    <target name="UsbCbi1_clean">

-      <OutputDirSetup baseName="UsbCbi1" mbdFilename="${MODULE_DIR}\UsbCbi1.mbd" msaFilename="${MODULE_DIR}\UsbCbi1.msa"/>

+      <OutputDirSetup baseName="UsbCbi1" mbdFilename="${MODULE_DIR}/UsbCbi1.mbd" msaFilename="${MODULE_DIR}/UsbCbi1.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbCbi1_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbCbi1_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbCbi1_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbCbi1_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbCbi1_cleanall">

-      <OutputDirSetup baseName="UsbCbi1" mbdFilename="${MODULE_DIR}\UsbCbi1.mbd" msaFilename="${MODULE_DIR}\UsbCbi1.msa"/>

+      <OutputDirSetup baseName="UsbCbi1" mbdFilename="${MODULE_DIR}/UsbCbi1.mbd" msaFilename="${MODULE_DIR}/UsbCbi1.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbCbi1_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbCbi1_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbCbi1_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbCbi1_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/build.xml b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/build.xml
index 2608381d96..fda7667eb5 100644
--- a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Usb\UsbKb\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbKb/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbKb">

-      <GenBuild baseName="UsbKb" mbdFilename="${MODULE_DIR}\UsbKb.mbd" msaFilename="${MODULE_DIR}\UsbKb.msa"/>

+      <GenBuild baseName="UsbKb" mbdFilename="${MODULE_DIR}/UsbKb.mbd" msaFilename="${MODULE_DIR}/UsbKb.msa"/>

    </target>

    <target depends="UsbKb_clean" name="clean"/>

    <target depends="UsbKb_cleanall" name="cleanall"/>

    <target name="UsbKb_clean">

-      <OutputDirSetup baseName="UsbKb" mbdFilename="${MODULE_DIR}\UsbKb.mbd" msaFilename="${MODULE_DIR}\UsbKb.msa"/>

+      <OutputDirSetup baseName="UsbKb" mbdFilename="${MODULE_DIR}/UsbKb.mbd" msaFilename="${MODULE_DIR}/UsbKb.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbKb_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbKb_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbKb_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbKb_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbKb_cleanall">

-      <OutputDirSetup baseName="UsbKb" mbdFilename="${MODULE_DIR}\UsbKb.mbd" msaFilename="${MODULE_DIR}\UsbKb.msa"/>

+      <OutputDirSetup baseName="UsbKb" mbdFilename="${MODULE_DIR}/UsbKb.mbd" msaFilename="${MODULE_DIR}/UsbKb.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbKb_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbKb_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbKb_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbKb_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/build.xml b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/build.xml
index d2e48d3027..3d983166ed 100644
--- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Usb\UsbMassStorage\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbMassStorage/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbMassStorage">

-      <GenBuild baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}\UsbMassStorage.mbd" msaFilename="${MODULE_DIR}\UsbMassStorage.msa"/>

+      <GenBuild baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}/UsbMassStorage.mbd" msaFilename="${MODULE_DIR}/UsbMassStorage.msa"/>

    </target>

    <target depends="UsbMassStorage_clean" name="clean"/>

    <target depends="UsbMassStorage_cleanall" name="cleanall"/>

    <target name="UsbMassStorage_clean">

-      <OutputDirSetup baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}\UsbMassStorage.mbd" msaFilename="${MODULE_DIR}\UsbMassStorage.msa"/>

+      <OutputDirSetup baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}/UsbMassStorage.mbd" msaFilename="${MODULE_DIR}/UsbMassStorage.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbMassStorage_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbMassStorage_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbMassStorage_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbMassStorage_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbMassStorage_cleanall">

-      <OutputDirSetup baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}\UsbMassStorage.mbd" msaFilename="${MODULE_DIR}\UsbMassStorage.msa"/>

+      <OutputDirSetup baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}/UsbMassStorage.mbd" msaFilename="${MODULE_DIR}/UsbMassStorage.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbMassStorage_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbMassStorage_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbMassStorage_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbMassStorage_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/build.xml b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/build.xml
index 081a9e0582..3ce60ca27b 100644
--- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Bus\Usb\UsbMouse\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbMouse/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbMouse">

-      <GenBuild baseName="UsbMouse" mbdFilename="${MODULE_DIR}\UsbMouse.mbd" msaFilename="${MODULE_DIR}\UsbMouse.msa"/>

+      <GenBuild baseName="UsbMouse" mbdFilename="${MODULE_DIR}/UsbMouse.mbd" msaFilename="${MODULE_DIR}/UsbMouse.msa"/>

    </target>

    <target depends="UsbMouse_clean" name="clean"/>

    <target depends="UsbMouse_cleanall" name="cleanall"/>

    <target name="UsbMouse_clean">

-      <OutputDirSetup baseName="UsbMouse" mbdFilename="${MODULE_DIR}\UsbMouse.mbd" msaFilename="${MODULE_DIR}\UsbMouse.msa"/>

+      <OutputDirSetup baseName="UsbMouse" mbdFilename="${MODULE_DIR}/UsbMouse.mbd" msaFilename="${MODULE_DIR}/UsbMouse.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbMouse_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbMouse_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbMouse_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbMouse_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbMouse_cleanall">

-      <OutputDirSetup baseName="UsbMouse" mbdFilename="${MODULE_DIR}\UsbMouse.mbd" msaFilename="${MODULE_DIR}\UsbMouse.msa"/>

+      <OutputDirSetup baseName="UsbMouse" mbdFilename="${MODULE_DIR}/UsbMouse.mbd" msaFilename="${MODULE_DIR}/UsbMouse.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbMouse_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbMouse_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbMouse_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbMouse_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Core/Dxe/DxeMain.msa b/EdkModulePkg/Core/Dxe/DxeMain.msa
index 42531812df..9f9de4a86a 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain.msa
+++ b/EdkModulePkg/Core/Dxe/DxeMain.msa
@@ -39,36 +39,36 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>

     </LibraryClassDefinitions>

     <SourceFiles>

-        <Filename>DxeMain\DxeMain.c</Filename>

-        <Filename>DxeMain\DxeProtocolNotify.c</Filename>

-        <Filename>Dispatcher\Dispatcher.c</Filename>

-        <Filename>Dispatcher\Dependency.c</Filename>

-        <Filename>Event\ExecData.c</Filename>

-        <Filename>Event\Event.c</Filename>

-        <Filename>Event\Timer.c</Filename>

-        <Filename>Event\Tpl.c</Filename>

-        <Filename>FwVol\FwVol.c</Filename>

-        <Filename>FwVol\Ffs.c</Filename>

-        <Filename>FwVol\FwVolAttrib.c</Filename>

-        <Filename>FwVol\FwVolRead.c</Filename>

-        <Filename>FwVol\FwVolWrite.c</Filename>

-        <Filename>FwVolBlock\FwVolBlock.c</Filename>

-        <Filename>Mem\MemData.c</Filename>

-        <Filename>Mem\Page.c</Filename>

-        <Filename>Mem\Pool.c</Filename>

-        <Filename>Gcd\Gcd.c</Filename>

-        <Filename>Hand\Handle.c</Filename>

-        <Filename>Hand\Locate.c</Filename>

-        <Filename>Hand\Notify.c</Filename>

-        <Filename>Hand\DriverSupport.c</Filename>

-        <Filename>Library\Library.c</Filename>

-        <Filename>Misc\InstallConfigurationTable.c</Filename>

-        <Filename>Misc\SetWatchdogTimer.c</Filename>

-        <Filename>Misc\Stall.c</Filename>

-        <Filename>Misc\DebugImageInfo.c</Filename>

-        <Filename>Image\Image.c</Filename>

-        <Filename>Image\ImageFile.c</Filename>

-        <Filename>SectionExtraction\CoreSectionExtraction.c</Filename>

+        <Filename>DxeMain/DxeMain.c</Filename>

+        <Filename>DxeMain/DxeProtocolNotify.c</Filename>

+        <Filename>Dispatcher/Dispatcher.c</Filename>

+        <Filename>Dispatcher/Dependency.c</Filename>

+        <Filename>Event/ExecData.c</Filename>

+        <Filename>Event/Event.c</Filename>

+        <Filename>Event/Timer.c</Filename>

+        <Filename>Event/Tpl.c</Filename>

+        <Filename>FwVol/FwVol.c</Filename>

+        <Filename>FwVol/Ffs.c</Filename>

+        <Filename>FwVol/FwVolAttrib.c</Filename>

+        <Filename>FwVol/FwVolRead.c</Filename>

+        <Filename>FwVol/FwVolWrite.c</Filename>

+        <Filename>FwVolBlock/FwVolBlock.c</Filename>

+        <Filename>Mem/MemData.c</Filename>

+        <Filename>Mem/Page.c</Filename>

+        <Filename>Mem/Pool.c</Filename>

+        <Filename>Gcd/Gcd.c</Filename>

+        <Filename>Hand/Handle.c</Filename>

+        <Filename>Hand/Locate.c</Filename>

+        <Filename>Hand/Notify.c</Filename>

+        <Filename>Hand/DriverSupport.c</Filename>

+        <Filename>Library/Library.c</Filename>

+        <Filename>Misc/InstallConfigurationTable.c</Filename>

+        <Filename>Misc/SetWatchdogTimer.c</Filename>

+        <Filename>Misc/Stall.c</Filename>

+        <Filename>Misc/DebugImageInfo.c</Filename>

+        <Filename>Image/Image.c</Filename>

+        <Filename>Image/ImageFile.c</Filename>

+        <Filename>SectionExtraction/CoreSectionExtraction.c</Filename>

         <Filename>DebugImageInfo.h</Filename>

         <Filename>DebugMask.h</Filename>

         <Filename>DxeMain.h</Filename>

diff --git a/EdkModulePkg/Core/Dxe/build.xml b/EdkModulePkg/Core/Dxe/build.xml
index 1041d64072..f153562941 100644
--- a/EdkModulePkg/Core/Dxe/build.xml
+++ b/EdkModulePkg/Core/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Core\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Core/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeMain">

-      <GenBuild baseName="DxeMain" mbdFilename="${MODULE_DIR}\DxeMain.mbd" msaFilename="${MODULE_DIR}\DxeMain.msa"/>

+      <GenBuild baseName="DxeMain" mbdFilename="${MODULE_DIR}/DxeMain.mbd" msaFilename="${MODULE_DIR}/DxeMain.msa"/>

    </target>

    <target depends="DxeMain_clean" name="clean"/>

    <target depends="DxeMain_cleanall" name="cleanall"/>

    <target name="DxeMain_clean">

-      <OutputDirSetup baseName="DxeMain" mbdFilename="${MODULE_DIR}\DxeMain.mbd" msaFilename="${MODULE_DIR}\DxeMain.msa"/>

+      <OutputDirSetup baseName="DxeMain" mbdFilename="${MODULE_DIR}/DxeMain.mbd" msaFilename="${MODULE_DIR}/DxeMain.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeMain_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeMain_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeMain_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeMain_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeMain_cleanall">

-      <OutputDirSetup baseName="DxeMain" mbdFilename="${MODULE_DIR}\DxeMain.mbd" msaFilename="${MODULE_DIR}\DxeMain.msa"/>

+      <OutputDirSetup baseName="DxeMain" mbdFilename="${MODULE_DIR}/DxeMain.mbd" msaFilename="${MODULE_DIR}/DxeMain.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeMain_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeMain_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeMain_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeMain_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
index 7d7d531cca..ebc83fcd86 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
@@ -52,20 +52,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>DxeLoad.c</Filename>

     <Filename>DxeIpl.dxs</Filename>

     <Arch ArchType="IA32">

-      <Filename>ia32\ImageRead.c</Filename>

-      <Filename>ia32\DxeLoadFunc.c</Filename>

+      <Filename>ia32/ImageRead.c</Filename>

+      <Filename>ia32/DxeLoadFunc.c</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>ia32\ImageRead.c</Filename>

-      <Filename>ia32\DxeLoadFunc.c</Filename>

+      <Filename>ia32/ImageRead.c</Filename>

+      <Filename>ia32/DxeLoadFunc.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>ipf\ImageRead.c</Filename>

-      <Filename>ipf\DxeLoadFunc.c</Filename>

+      <Filename>ipf/ImageRead.c</Filename>

+      <Filename>ipf/DxeLoadFunc.c</Filename>

     </Arch>

     <Arch ArchType="EBC">

-      <Filename>ia32\ImageRead.c</Filename>

-      <Filename>ia32\DxeLoadFunc.c</Filename>

+      <Filename>ia32/ImageRead.c</Filename>

+      <Filename>ia32/DxeLoadFunc.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa b/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa
index df4efbc285..e69b824e10 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa
@@ -52,10 +52,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>DxeIpl.dxs</Filename>

     <Filename>DxeLoadX64.c</Filename>

     <Arch ArchType="IA32">

-      <Filename>x64\ImageRead.c</Filename>

-      <Filename>x64\LongMode.asm</Filename>

-      <Filename>x64\DxeLoadFunc.c</Filename>

-      <Filename>x64\VirtualMemory.c</Filename>

+      <Filename>x64/ImageRead.c</Filename>

+      <Filename>x64/LongMode.asm</Filename>

+      <Filename>x64/DxeLoadFunc.c</Filename>

+      <Filename>x64/VirtualMemory.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Core/DxeIplPeim/build.xml b/EdkModulePkg/Core/DxeIplPeim/build.xml
index 5f83fe7365..bb88e8a2c8 100644
--- a/EdkModulePkg/Core/DxeIplPeim/build.xml
+++ b/EdkModulePkg/Core/DxeIplPeim/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Core\DxeIplPeim"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Core/DxeIplPeim"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeIpl">

-      <GenBuild baseName="DxeIpl" mbdFilename="${MODULE_DIR}\DxeIpl.mbd" msaFilename="${MODULE_DIR}\DxeIpl.msa"/>

+      <GenBuild baseName="DxeIpl" mbdFilename="${MODULE_DIR}/DxeIpl.mbd" msaFilename="${MODULE_DIR}/DxeIpl.msa"/>

    </target>

    <target depends="DxeIpl_clean" name="clean"/>

    <target depends="DxeIpl_cleanall" name="cleanall"/>

    <target name="DxeIpl_clean">

-      <OutputDirSetup baseName="DxeIpl" mbdFilename="${MODULE_DIR}\DxeIpl.mbd" msaFilename="${MODULE_DIR}\DxeIpl.msa"/>

+      <OutputDirSetup baseName="DxeIpl" mbdFilename="${MODULE_DIR}/DxeIpl.mbd" msaFilename="${MODULE_DIR}/DxeIpl.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeIpl_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeIpl_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeIpl_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeIpl_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeIpl_cleanall">

-      <OutputDirSetup baseName="DxeIpl" mbdFilename="${MODULE_DIR}\DxeIpl.mbd" msaFilename="${MODULE_DIR}\DxeIpl.msa"/>

+      <OutputDirSetup baseName="DxeIpl" mbdFilename="${MODULE_DIR}/DxeIpl.mbd" msaFilename="${MODULE_DIR}/DxeIpl.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeIpl_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeIpl_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeIpl_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeIpl_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Core/Pei/PeiMain.msa b/EdkModulePkg/Core/Pei/PeiMain.msa
index b18b178caa..1c6a2b22be 100644
--- a/EdkModulePkg/Core/Pei/PeiMain.msa
+++ b/EdkModulePkg/Core/Pei/PeiMain.msa
@@ -45,22 +45,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>PeiMain.h</Filename>

-    <Filename>BootMode\BootMode.c</Filename>

-    <Filename>Dependency\Dependency.c</Filename>

-    <Filename>Dispatcher\Dispatcher.c</Filename>

-    <Filename>FwVol\FwVol.c</Filename>

-    <Filename>Hob\Hob.c</Filename>

-    <Filename>Image\Image.c</Filename>

-    <Filename>Memory\MemoryServices.c</Filename>

-    <Filename>PeiMain\PeiMain.c</Filename>

-    <Filename>Ppi\Ppi.c</Filename>

-    <Filename>Reset\Reset.c</Filename>

-    <Filename>Security\Security.c</Filename>

-    <Filename>StatusCode\StatusCode.c</Filename>

+    <Filename>BootMode/BootMode.c</Filename>

+    <Filename>Dependency/Dependency.c</Filename>

+    <Filename>Dispatcher/Dispatcher.c</Filename>

+    <Filename>FwVol/FwVol.c</Filename>

+    <Filename>Hob/Hob.c</Filename>

+    <Filename>Image/Image.c</Filename>

+    <Filename>Memory/MemoryServices.c</Filename>

+    <Filename>PeiMain/PeiMain.c</Filename>

+    <Filename>Ppi/Ppi.c</Filename>

+    <Filename>Reset/Reset.c</Filename>

+    <Filename>Security/Security.c</Filename>

+    <Filename>StatusCode/StatusCode.c</Filename>

     <Arch ArchType="IPF">

-      <Filename>ipf\SwitchToCacheMode.c</Filename>

-      <Filename>ipf\IpfCpuCore.i</Filename>

-      <Filename>ipf\IpfCpuCore.s</Filename>

+      <Filename>ipf/SwitchToCacheMode.c</Filename>

+      <Filename>ipf/IpfCpuCore.i</Filename>

+      <Filename>ipf/IpfCpuCore.s</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Core/Pei/build.xml b/EdkModulePkg/Core/Pei/build.xml
index 94a26db352..8ffb689878 100644
--- a/EdkModulePkg/Core/Pei/build.xml
+++ b/EdkModulePkg/Core/Pei/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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="Core\Pei"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Core/Pei"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiMain">

-      <GenBuild baseName="PeiMain" mbdFilename="${MODULE_DIR}\PeiMain.mbd" msaFilename="${MODULE_DIR}\PeiMain.msa"/>

+      <GenBuild baseName="PeiMain" mbdFilename="${MODULE_DIR}/PeiMain.mbd" msaFilename="${MODULE_DIR}/PeiMain.msa"/>

    </target>

    <target depends="PeiMain_clean" name="clean"/>

    <target depends="PeiMain_cleanall" name="cleanall"/>

    <target name="PeiMain_clean">

-      <OutputDirSetup baseName="PeiMain" mbdFilename="${MODULE_DIR}\PeiMain.mbd" msaFilename="${MODULE_DIR}\PeiMain.msa"/>

+      <OutputDirSetup baseName="PeiMain" mbdFilename="${MODULE_DIR}/PeiMain.mbd" msaFilename="${MODULE_DIR}/PeiMain.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiMain_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiMain_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiMain_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiMain_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiMain_cleanall">

-      <OutputDirSetup baseName="PeiMain" mbdFilename="${MODULE_DIR}\PeiMain.mbd" msaFilename="${MODULE_DIR}\PeiMain.msa"/>

+      <OutputDirSetup baseName="PeiMain" mbdFilename="${MODULE_DIR}/PeiMain.mbd" msaFilename="${MODULE_DIR}/PeiMain.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiMain_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiMain_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiMain_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiMain_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/BaseCustomDecompressLibNull/build.xml b/EdkModulePkg/Library/BaseCustomDecompressLibNull/build.xml
index d2f8ab44df..30ee33c56a 100644
--- a/EdkModulePkg/Library/BaseCustomDecompressLibNull/build.xml
+++ b/EdkModulePkg/Library/BaseCustomDecompressLibNull/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseCustomDecompressLibNull"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseCustomDecompressLibNull"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseCustomDecompressLibNull">

-      <GenBuild baseName="BaseCustomDecompressLibNull" mbdFilename="${MODULE_DIR}\BaseCustomDecompressLibNull.mbd" msaFilename="${MODULE_DIR}\BaseCustomDecompressLibNull.msa"/>

+      <GenBuild baseName="BaseCustomDecompressLibNull" mbdFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.mbd" msaFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.msa"/>

    </target>

    <target depends="BaseCustomDecompressLibNull_clean" name="clean"/>

    <target depends="BaseCustomDecompressLibNull_cleanall" name="cleanall"/>

    <target name="BaseCustomDecompressLibNull_clean">

-      <OutputDirSetup baseName="BaseCustomDecompressLibNull" mbdFilename="${MODULE_DIR}\BaseCustomDecompressLibNull.mbd" msaFilename="${MODULE_DIR}\BaseCustomDecompressLibNull.msa"/>

+      <OutputDirSetup baseName="BaseCustomDecompressLibNull" mbdFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.mbd" msaFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseCustomDecompressLibNull_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseCustomDecompressLibNull_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseCustomDecompressLibNull_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseCustomDecompressLibNull_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseCustomDecompressLibNull_cleanall">

-      <OutputDirSetup baseName="BaseCustomDecompressLibNull" mbdFilename="${MODULE_DIR}\BaseCustomDecompressLibNull.mbd" msaFilename="${MODULE_DIR}\BaseCustomDecompressLibNull.msa"/>

+      <OutputDirSetup baseName="BaseCustomDecompressLibNull" mbdFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.mbd" msaFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseCustomDecompressLibNull_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseCustomDecompressLibNull_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseCustomDecompressLibNull_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseCustomDecompressLibNull_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/BaseUefiTianoDecompressLib/build.xml b/EdkModulePkg/Library/BaseUefiTianoDecompressLib/build.xml
index 9b8695b963..42b0263471 100644
--- a/EdkModulePkg/Library/BaseUefiTianoDecompressLib/build.xml
+++ b/EdkModulePkg/Library/BaseUefiTianoDecompressLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseUefiTianoDecompressLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseUefiTianoDecompressLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseUefiTianoDecompressLib">

-      <GenBuild baseName="BaseUefiTianoDecompressLib" mbdFilename="${MODULE_DIR}\BaseUefiTianoDecompressLib.mbd" msaFilename="${MODULE_DIR}\BaseUefiTianoDecompressLib.msa"/>

+      <GenBuild baseName="BaseUefiTianoDecompressLib" mbdFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.mbd" msaFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.msa"/>

    </target>

    <target depends="BaseUefiTianoDecompressLib_clean" name="clean"/>

    <target depends="BaseUefiTianoDecompressLib_cleanall" name="cleanall"/>

    <target name="BaseUefiTianoDecompressLib_clean">

-      <OutputDirSetup baseName="BaseUefiTianoDecompressLib" mbdFilename="${MODULE_DIR}\BaseUefiTianoDecompressLib.mbd" msaFilename="${MODULE_DIR}\BaseUefiTianoDecompressLib.msa"/>

+      <OutputDirSetup baseName="BaseUefiTianoDecompressLib" mbdFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.mbd" msaFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseUefiTianoDecompressLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseUefiTianoDecompressLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseUefiTianoDecompressLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseUefiTianoDecompressLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseUefiTianoDecompressLib_cleanall">

-      <OutputDirSetup baseName="BaseUefiTianoDecompressLib" mbdFilename="${MODULE_DIR}\BaseUefiTianoDecompressLib.mbd" msaFilename="${MODULE_DIR}\BaseUefiTianoDecompressLib.msa"/>

+      <OutputDirSetup baseName="BaseUefiTianoDecompressLib" mbdFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.mbd" msaFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseUefiTianoDecompressLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseUefiTianoDecompressLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseUefiTianoDecompressLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseUefiTianoDecompressLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/build.xml b/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/build.xml
index c8fb0f7cd6..c18b27fa71 100644
--- a/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/build.xml
+++ b/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeCoreCustomDecompressLibFromHob"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeCoreCustomDecompressLibFromHob"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeCoreCustomDecompressLibFromHob">

-      <GenBuild baseName="DxeCoreCustomDecompressLibFromHob" mbdFilename="${MODULE_DIR}\DxeCoreCustomDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}\DxeCoreCustomDecompressLibFromHob.msa"/>

+      <GenBuild baseName="DxeCoreCustomDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.msa"/>

    </target>

    <target depends="DxeCoreCustomDecompressLibFromHob_clean" name="clean"/>

    <target depends="DxeCoreCustomDecompressLibFromHob_cleanall" name="cleanall"/>

    <target name="DxeCoreCustomDecompressLibFromHob_clean">

-      <OutputDirSetup baseName="DxeCoreCustomDecompressLibFromHob" mbdFilename="${MODULE_DIR}\DxeCoreCustomDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}\DxeCoreCustomDecompressLibFromHob.msa"/>

+      <OutputDirSetup baseName="DxeCoreCustomDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCoreCustomDecompressLibFromHob_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCoreCustomDecompressLibFromHob_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCoreCustomDecompressLibFromHob_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreCustomDecompressLibFromHob_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeCoreCustomDecompressLibFromHob_cleanall">

-      <OutputDirSetup baseName="DxeCoreCustomDecompressLibFromHob" mbdFilename="${MODULE_DIR}\DxeCoreCustomDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}\DxeCoreCustomDecompressLibFromHob.msa"/>

+      <OutputDirSetup baseName="DxeCoreCustomDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCoreCustomDecompressLibFromHob_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCoreCustomDecompressLibFromHob_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCoreCustomDecompressLibFromHob_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreCustomDecompressLibFromHob_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/DxeCorePerformanceLib/build.xml b/EdkModulePkg/Library/DxeCorePerformanceLib/build.xml
index b9d04eed7b..c711b30e2c 100644
--- a/EdkModulePkg/Library/DxeCorePerformanceLib/build.xml
+++ b/EdkModulePkg/Library/DxeCorePerformanceLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeCorePerformanceLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeCorePerformanceLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeCorePerformanceLib">

-      <GenBuild baseName="DxeCorePerformanceLib" mbdFilename="${MODULE_DIR}\DxeCorePerformanceLib.mbd" msaFilename="${MODULE_DIR}\DxeCorePerformanceLib.msa"/>

+      <GenBuild baseName="DxeCorePerformanceLib" mbdFilename="${MODULE_DIR}/DxeCorePerformanceLib.mbd" msaFilename="${MODULE_DIR}/DxeCorePerformanceLib.msa"/>

    </target>

    <target depends="DxeCorePerformanceLib_clean" name="clean"/>

    <target depends="DxeCorePerformanceLib_cleanall" name="cleanall"/>

    <target name="DxeCorePerformanceLib_clean">

-      <OutputDirSetup baseName="DxeCorePerformanceLib" mbdFilename="${MODULE_DIR}\DxeCorePerformanceLib.mbd" msaFilename="${MODULE_DIR}\DxeCorePerformanceLib.msa"/>

+      <OutputDirSetup baseName="DxeCorePerformanceLib" mbdFilename="${MODULE_DIR}/DxeCorePerformanceLib.mbd" msaFilename="${MODULE_DIR}/DxeCorePerformanceLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCorePerformanceLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCorePerformanceLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCorePerformanceLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCorePerformanceLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeCorePerformanceLib_cleanall">

-      <OutputDirSetup baseName="DxeCorePerformanceLib" mbdFilename="${MODULE_DIR}\DxeCorePerformanceLib.mbd" msaFilename="${MODULE_DIR}\DxeCorePerformanceLib.msa"/>

+      <OutputDirSetup baseName="DxeCorePerformanceLib" mbdFilename="${MODULE_DIR}/DxeCorePerformanceLib.mbd" msaFilename="${MODULE_DIR}/DxeCorePerformanceLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCorePerformanceLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCorePerformanceLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCorePerformanceLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCorePerformanceLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/build.xml b/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/build.xml
index 095b92e284..c59b44c9e7 100644
--- a/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/build.xml
+++ b/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeCoreTianoDecompressLibFromHob"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeCoreTianoDecompressLibFromHob"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeCoreTianoDecompressLibFromHob">

-      <GenBuild baseName="DxeCoreTianoDecompressLibFromHob" mbdFilename="${MODULE_DIR}\DxeCoreTianoDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}\DxeCoreTianoDecompressLibFromHob.msa"/>

+      <GenBuild baseName="DxeCoreTianoDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.msa"/>

    </target>

    <target depends="DxeCoreTianoDecompressLibFromHob_clean" name="clean"/>

    <target depends="DxeCoreTianoDecompressLibFromHob_cleanall" name="cleanall"/>

    <target name="DxeCoreTianoDecompressLibFromHob_clean">

-      <OutputDirSetup baseName="DxeCoreTianoDecompressLibFromHob" mbdFilename="${MODULE_DIR}\DxeCoreTianoDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}\DxeCoreTianoDecompressLibFromHob.msa"/>

+      <OutputDirSetup baseName="DxeCoreTianoDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCoreTianoDecompressLibFromHob_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCoreTianoDecompressLibFromHob_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCoreTianoDecompressLibFromHob_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreTianoDecompressLibFromHob_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeCoreTianoDecompressLibFromHob_cleanall">

-      <OutputDirSetup baseName="DxeCoreTianoDecompressLibFromHob" mbdFilename="${MODULE_DIR}\DxeCoreTianoDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}\DxeCoreTianoDecompressLibFromHob.msa"/>

+      <OutputDirSetup baseName="DxeCoreTianoDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCoreTianoDecompressLibFromHob_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCoreTianoDecompressLibFromHob_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCoreTianoDecompressLibFromHob_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreTianoDecompressLibFromHob_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/build.xml b/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/build.xml
index b46ad569f0..92fedafb07 100644
--- a/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/build.xml
+++ b/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeCoreUefiDecompressLibFromHob"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeCoreUefiDecompressLibFromHob"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeCoreUefiDecompressLibFromHob">

-      <GenBuild baseName="DxeCoreUefiDecompressLibFromHob" mbdFilename="${MODULE_DIR}\DxeCoreUefiDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}\DxeCoreUefiDecompressLibFromHob.msa"/>

+      <GenBuild baseName="DxeCoreUefiDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.msa"/>

    </target>

    <target depends="DxeCoreUefiDecompressLibFromHob_clean" name="clean"/>

    <target depends="DxeCoreUefiDecompressLibFromHob_cleanall" name="cleanall"/>

    <target name="DxeCoreUefiDecompressLibFromHob_clean">

-      <OutputDirSetup baseName="DxeCoreUefiDecompressLibFromHob" mbdFilename="${MODULE_DIR}\DxeCoreUefiDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}\DxeCoreUefiDecompressLibFromHob.msa"/>

+      <OutputDirSetup baseName="DxeCoreUefiDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCoreUefiDecompressLibFromHob_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCoreUefiDecompressLibFromHob_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCoreUefiDecompressLibFromHob_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreUefiDecompressLibFromHob_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeCoreUefiDecompressLibFromHob_cleanall">

-      <OutputDirSetup baseName="DxeCoreUefiDecompressLibFromHob" mbdFilename="${MODULE_DIR}\DxeCoreUefiDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}\DxeCoreUefiDecompressLibFromHob.msa"/>

+      <OutputDirSetup baseName="DxeCoreUefiDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCoreUefiDecompressLibFromHob_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCoreUefiDecompressLibFromHob_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCoreUefiDecompressLibFromHob_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreUefiDecompressLibFromHob_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/build.xml b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/build.xml
index fb105466c7..6cedc55c5f 100644
--- a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/build.xml
+++ b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkDxeDebugLibReportStatusCode"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkDxeDebugLibReportStatusCode"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkDxeDebugLibReportStatusCode">

-      <GenBuild baseName="EdkDxeDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}\EdkDxeDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}\EdkDxeDebugLibReportStatusCode.msa"/>

+      <GenBuild baseName="EdkDxeDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.msa"/>

    </target>

    <target depends="EdkDxeDebugLibReportStatusCode_clean" name="clean"/>

    <target depends="EdkDxeDebugLibReportStatusCode_cleanall" name="cleanall"/>

    <target name="EdkDxeDebugLibReportStatusCode_clean">

-      <OutputDirSetup baseName="EdkDxeDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}\EdkDxeDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}\EdkDxeDebugLibReportStatusCode.msa"/>

+      <OutputDirSetup baseName="EdkDxeDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxeDebugLibReportStatusCode_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxeDebugLibReportStatusCode_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxeDebugLibReportStatusCode_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeDebugLibReportStatusCode_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkDxeDebugLibReportStatusCode_cleanall">

-      <OutputDirSetup baseName="EdkDxeDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}\EdkDxeDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}\EdkDxeDebugLibReportStatusCode.msa"/>

+      <OutputDirSetup baseName="EdkDxeDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxeDebugLibReportStatusCode_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxeDebugLibReportStatusCode_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxeDebugLibReportStatusCode_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeDebugLibReportStatusCode_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkDxePeCoffLoaderFromHobLib/build.xml b/EdkModulePkg/Library/EdkDxePeCoffLoaderFromHobLib/build.xml
index ba50f03c3d..ad5f9c967d 100644
--- a/EdkModulePkg/Library/EdkDxePeCoffLoaderFromHobLib/build.xml
+++ b/EdkModulePkg/Library/EdkDxePeCoffLoaderFromHobLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkDxePeCoffLoaderFromHobLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkDxePeCoffLoaderFromHobLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkDxePeCoffLoaderFromHobLib">

-      <GenBuild baseName="EdkDxePeCoffLoaderFromHobLib" mbdFilename="${MODULE_DIR}\EdkDxePeCoffLoaderFromHobLib.mbd" msaFilename="${MODULE_DIR}\EdkDxePeCoffLoaderFromHobLib.msa"/>

+      <GenBuild baseName="EdkDxePeCoffLoaderFromHobLib" mbdFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.msa"/>

    </target>

    <target depends="EdkDxePeCoffLoaderFromHobLib_clean" name="clean"/>

    <target depends="EdkDxePeCoffLoaderFromHobLib_cleanall" name="cleanall"/>

    <target name="EdkDxePeCoffLoaderFromHobLib_clean">

-      <OutputDirSetup baseName="EdkDxePeCoffLoaderFromHobLib" mbdFilename="${MODULE_DIR}\EdkDxePeCoffLoaderFromHobLib.mbd" msaFilename="${MODULE_DIR}\EdkDxePeCoffLoaderFromHobLib.msa"/>

+      <OutputDirSetup baseName="EdkDxePeCoffLoaderFromHobLib" mbdFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxePeCoffLoaderFromHobLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxePeCoffLoaderFromHobLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxePeCoffLoaderFromHobLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxePeCoffLoaderFromHobLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkDxePeCoffLoaderFromHobLib_cleanall">

-      <OutputDirSetup baseName="EdkDxePeCoffLoaderFromHobLib" mbdFilename="${MODULE_DIR}\EdkDxePeCoffLoaderFromHobLib.mbd" msaFilename="${MODULE_DIR}\EdkDxePeCoffLoaderFromHobLib.msa"/>

+      <OutputDirSetup baseName="EdkDxePeCoffLoaderFromHobLib" mbdFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxePeCoffLoaderFromHobLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxePeCoffLoaderFromHobLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxePeCoffLoaderFromHobLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxePeCoffLoaderFromHobLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkDxePerformanceLib/build.xml b/EdkModulePkg/Library/EdkDxePerformanceLib/build.xml
index 5a1dca4e89..3165132c01 100644
--- a/EdkModulePkg/Library/EdkDxePerformanceLib/build.xml
+++ b/EdkModulePkg/Library/EdkDxePerformanceLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkDxePerformanceLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkDxePerformanceLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkDxePerformanceLib">

-      <GenBuild baseName="EdkDxePerformanceLib" mbdFilename="${MODULE_DIR}\EdkDxePerformanceLib.mbd" msaFilename="${MODULE_DIR}\EdkDxePerformanceLib.msa"/>

+      <GenBuild baseName="EdkDxePerformanceLib" mbdFilename="${MODULE_DIR}/EdkDxePerformanceLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePerformanceLib.msa"/>

    </target>

    <target depends="EdkDxePerformanceLib_clean" name="clean"/>

    <target depends="EdkDxePerformanceLib_cleanall" name="cleanall"/>

    <target name="EdkDxePerformanceLib_clean">

-      <OutputDirSetup baseName="EdkDxePerformanceLib" mbdFilename="${MODULE_DIR}\EdkDxePerformanceLib.mbd" msaFilename="${MODULE_DIR}\EdkDxePerformanceLib.msa"/>

+      <OutputDirSetup baseName="EdkDxePerformanceLib" mbdFilename="${MODULE_DIR}/EdkDxePerformanceLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePerformanceLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxePerformanceLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxePerformanceLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxePerformanceLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxePerformanceLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkDxePerformanceLib_cleanall">

-      <OutputDirSetup baseName="EdkDxePerformanceLib" mbdFilename="${MODULE_DIR}\EdkDxePerformanceLib.mbd" msaFilename="${MODULE_DIR}\EdkDxePerformanceLib.msa"/>

+      <OutputDirSetup baseName="EdkDxePerformanceLib" mbdFilename="${MODULE_DIR}/EdkDxePerformanceLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePerformanceLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxePerformanceLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxePerformanceLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxePerformanceLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxePerformanceLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkDxePrintLib/build.xml b/EdkModulePkg/Library/EdkDxePrintLib/build.xml
index 2ad6bed86c..e9ae5b6700 100644
--- a/EdkModulePkg/Library/EdkDxePrintLib/build.xml
+++ b/EdkModulePkg/Library/EdkDxePrintLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkDxePrintLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkDxePrintLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkDxePrintLib">

-      <GenBuild baseName="EdkDxePrintLib" mbdFilename="${MODULE_DIR}\EdkDxePrintLib.mbd" msaFilename="${MODULE_DIR}\EdkDxePrintLib.msa"/>

+      <GenBuild baseName="EdkDxePrintLib" mbdFilename="${MODULE_DIR}/EdkDxePrintLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePrintLib.msa"/>

    </target>

    <target depends="EdkDxePrintLib_clean" name="clean"/>

    <target depends="EdkDxePrintLib_cleanall" name="cleanall"/>

    <target name="EdkDxePrintLib_clean">

-      <OutputDirSetup baseName="EdkDxePrintLib" mbdFilename="${MODULE_DIR}\EdkDxePrintLib.mbd" msaFilename="${MODULE_DIR}\EdkDxePrintLib.msa"/>

+      <OutputDirSetup baseName="EdkDxePrintLib" mbdFilename="${MODULE_DIR}/EdkDxePrintLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePrintLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxePrintLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxePrintLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxePrintLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxePrintLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkDxePrintLib_cleanall">

-      <OutputDirSetup baseName="EdkDxePrintLib" mbdFilename="${MODULE_DIR}\EdkDxePrintLib.mbd" msaFilename="${MODULE_DIR}\EdkDxePrintLib.msa"/>

+      <OutputDirSetup baseName="EdkDxePrintLib" mbdFilename="${MODULE_DIR}/EdkDxePrintLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePrintLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxePrintLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxePrintLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxePrintLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxePrintLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa b/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa
index 4d9183e32e..c650bdd831 100644
--- a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa
+++ b/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa
@@ -41,16 +41,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </LibraryClassDefinitions>

   <SourceFiles>

     <Arch ArchType="IA32">

-      <Filename>Common\RuntimeLib.c</Filename>

-      <Filename>Common\RuntimeService.c</Filename>

+      <Filename>Common/RuntimeLib.c</Filename>

+      <Filename>Common/RuntimeService.c</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>Common\RuntimeLib.c</Filename>

-      <Filename>Common\RuntimeService.c</Filename>

+      <Filename>Common/RuntimeLib.c</Filename>

+      <Filename>Common/RuntimeService.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\RuntimeLib.c</Filename>

-      <Filename>Ipf\RuntimeService.c</Filename>

+      <Filename>Ipf/RuntimeLib.c</Filename>

+      <Filename>Ipf/RuntimeService.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/build.xml b/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/build.xml
index e43f7080a9..1442612686 100644
--- a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/build.xml
+++ b/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkDxeRuntimeDriverLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkDxeRuntimeDriverLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkDxeRuntimeDriverLib">

-      <GenBuild baseName="EdkDxeRuntimeDriverLib" mbdFilename="${MODULE_DIR}\EdkDxeRuntimeDriverLib.mbd" msaFilename="${MODULE_DIR}\EdkDxeRuntimeDriverLib.msa"/>

+      <GenBuild baseName="EdkDxeRuntimeDriverLib" mbdFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.msa"/>

    </target>

    <target depends="EdkDxeRuntimeDriverLib_clean" name="clean"/>

    <target depends="EdkDxeRuntimeDriverLib_cleanall" name="cleanall"/>

    <target name="EdkDxeRuntimeDriverLib_clean">

-      <OutputDirSetup baseName="EdkDxeRuntimeDriverLib" mbdFilename="${MODULE_DIR}\EdkDxeRuntimeDriverLib.mbd" msaFilename="${MODULE_DIR}\EdkDxeRuntimeDriverLib.msa"/>

+      <OutputDirSetup baseName="EdkDxeRuntimeDriverLib" mbdFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxeRuntimeDriverLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxeRuntimeDriverLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxeRuntimeDriverLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeRuntimeDriverLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkDxeRuntimeDriverLib_cleanall">

-      <OutputDirSetup baseName="EdkDxeRuntimeDriverLib" mbdFilename="${MODULE_DIR}\EdkDxeRuntimeDriverLib.mbd" msaFilename="${MODULE_DIR}\EdkDxeRuntimeDriverLib.msa"/>

+      <OutputDirSetup baseName="EdkDxeRuntimeDriverLib" mbdFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxeRuntimeDriverLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxeRuntimeDriverLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxeRuntimeDriverLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeRuntimeDriverLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/build.xml b/EdkModulePkg/Library/EdkDxeSalLib/build.xml
index e4f1e3ea02..580d1a6e97 100644
--- a/EdkModulePkg/Library/EdkDxeSalLib/build.xml
+++ b/EdkModulePkg/Library/EdkDxeSalLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkDxeSalLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkDxeSalLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkDxeSalLib">

-      <GenBuild baseName="EdkDxeSalLib" mbdFilename="${MODULE_DIR}\EdkDxeSalLib.mbd" msaFilename="${MODULE_DIR}\EdkDxeSalLib.msa"/>

+      <GenBuild baseName="EdkDxeSalLib" mbdFilename="${MODULE_DIR}/EdkDxeSalLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeSalLib.msa"/>

    </target>

    <target depends="EdkDxeSalLib_clean" name="clean"/>

    <target depends="EdkDxeSalLib_cleanall" name="cleanall"/>

    <target name="EdkDxeSalLib_clean">

-      <OutputDirSetup baseName="EdkDxeSalLib" mbdFilename="${MODULE_DIR}\EdkDxeSalLib.mbd" msaFilename="${MODULE_DIR}\EdkDxeSalLib.msa"/>

+      <OutputDirSetup baseName="EdkDxeSalLib" mbdFilename="${MODULE_DIR}/EdkDxeSalLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeSalLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxeSalLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxeSalLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxeSalLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeSalLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkDxeSalLib_cleanall">

-      <OutputDirSetup baseName="EdkDxeSalLib" mbdFilename="${MODULE_DIR}\EdkDxeSalLib.mbd" msaFilename="${MODULE_DIR}\EdkDxeSalLib.msa"/>

+      <OutputDirSetup baseName="EdkDxeSalLib" mbdFilename="${MODULE_DIR}/EdkDxeSalLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeSalLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkDxeSalLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkDxeSalLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkDxeSalLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeSalLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/build.xml b/EdkModulePkg/Library/EdkFvbServiceLib/build.xml
index ebbb303b70..a111fb2c47 100644
--- a/EdkModulePkg/Library/EdkFvbServiceLib/build.xml
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkFvbServiceLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkFvbServiceLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkFvbServiceLib">

-      <GenBuild baseName="EdkFvbServiceLib" mbdFilename="${MODULE_DIR}\EdkFvbServiceLib.mbd" msaFilename="${MODULE_DIR}\EdkFvbServiceLib.msa"/>

+      <GenBuild baseName="EdkFvbServiceLib" mbdFilename="${MODULE_DIR}/EdkFvbServiceLib.mbd" msaFilename="${MODULE_DIR}/EdkFvbServiceLib.msa"/>

    </target>

    <target depends="EdkFvbServiceLib_clean" name="clean"/>

    <target depends="EdkFvbServiceLib_cleanall" name="cleanall"/>

    <target name="EdkFvbServiceLib_clean">

-      <OutputDirSetup baseName="EdkFvbServiceLib" mbdFilename="${MODULE_DIR}\EdkFvbServiceLib.mbd" msaFilename="${MODULE_DIR}\EdkFvbServiceLib.msa"/>

+      <OutputDirSetup baseName="EdkFvbServiceLib" mbdFilename="${MODULE_DIR}/EdkFvbServiceLib.mbd" msaFilename="${MODULE_DIR}/EdkFvbServiceLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkFvbServiceLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkFvbServiceLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkFvbServiceLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkFvbServiceLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkFvbServiceLib_cleanall">

-      <OutputDirSetup baseName="EdkFvbServiceLib" mbdFilename="${MODULE_DIR}\EdkFvbServiceLib.mbd" msaFilename="${MODULE_DIR}\EdkFvbServiceLib.msa"/>

+      <OutputDirSetup baseName="EdkFvbServiceLib" mbdFilename="${MODULE_DIR}/EdkFvbServiceLib.mbd" msaFilename="${MODULE_DIR}/EdkFvbServiceLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkFvbServiceLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkFvbServiceLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkFvbServiceLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkFvbServiceLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkGraphicsLib/build.xml b/EdkModulePkg/Library/EdkGraphicsLib/build.xml
index cccef0efe3..1bb245880d 100644
--- a/EdkModulePkg/Library/EdkGraphicsLib/build.xml
+++ b/EdkModulePkg/Library/EdkGraphicsLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkGraphicsLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkGraphicsLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkGraphicsLib">

-      <GenBuild baseName="EdkGraphicsLib" mbdFilename="${MODULE_DIR}\EdkGraphicsLib.mbd" msaFilename="${MODULE_DIR}\EdkGraphicsLib.msa"/>

+      <GenBuild baseName="EdkGraphicsLib" mbdFilename="${MODULE_DIR}/EdkGraphicsLib.mbd" msaFilename="${MODULE_DIR}/EdkGraphicsLib.msa"/>

    </target>

    <target depends="EdkGraphicsLib_clean" name="clean"/>

    <target depends="EdkGraphicsLib_cleanall" name="cleanall"/>

    <target name="EdkGraphicsLib_clean">

-      <OutputDirSetup baseName="EdkGraphicsLib" mbdFilename="${MODULE_DIR}\EdkGraphicsLib.mbd" msaFilename="${MODULE_DIR}\EdkGraphicsLib.msa"/>

+      <OutputDirSetup baseName="EdkGraphicsLib" mbdFilename="${MODULE_DIR}/EdkGraphicsLib.mbd" msaFilename="${MODULE_DIR}/EdkGraphicsLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkGraphicsLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkGraphicsLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkGraphicsLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkGraphicsLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkGraphicsLib_cleanall">

-      <OutputDirSetup baseName="EdkGraphicsLib" mbdFilename="${MODULE_DIR}\EdkGraphicsLib.mbd" msaFilename="${MODULE_DIR}\EdkGraphicsLib.msa"/>

+      <OutputDirSetup baseName="EdkGraphicsLib" mbdFilename="${MODULE_DIR}/EdkGraphicsLib.mbd" msaFilename="${MODULE_DIR}/EdkGraphicsLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkGraphicsLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkGraphicsLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkGraphicsLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkGraphicsLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkIfrSupportLib/build.xml b/EdkModulePkg/Library/EdkIfrSupportLib/build.xml
index 54b607a71f..50edb6a393 100644
--- a/EdkModulePkg/Library/EdkIfrSupportLib/build.xml
+++ b/EdkModulePkg/Library/EdkIfrSupportLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkIfrSupportLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkIfrSupportLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkIfrSupportLib">

-      <GenBuild baseName="EdkIfrSupportLib" mbdFilename="${MODULE_DIR}\EdkIfrSupportLib.mbd" msaFilename="${MODULE_DIR}\EdkIfrSupportLib.msa"/>

+      <GenBuild baseName="EdkIfrSupportLib" mbdFilename="${MODULE_DIR}/EdkIfrSupportLib.mbd" msaFilename="${MODULE_DIR}/EdkIfrSupportLib.msa"/>

    </target>

    <target depends="EdkIfrSupportLib_clean" name="clean"/>

    <target depends="EdkIfrSupportLib_cleanall" name="cleanall"/>

    <target name="EdkIfrSupportLib_clean">

-      <OutputDirSetup baseName="EdkIfrSupportLib" mbdFilename="${MODULE_DIR}\EdkIfrSupportLib.mbd" msaFilename="${MODULE_DIR}\EdkIfrSupportLib.msa"/>

+      <OutputDirSetup baseName="EdkIfrSupportLib" mbdFilename="${MODULE_DIR}/EdkIfrSupportLib.mbd" msaFilename="${MODULE_DIR}/EdkIfrSupportLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkIfrSupportLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkIfrSupportLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkIfrSupportLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkIfrSupportLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkIfrSupportLib_cleanall">

-      <OutputDirSetup baseName="EdkIfrSupportLib" mbdFilename="${MODULE_DIR}\EdkIfrSupportLib.mbd" msaFilename="${MODULE_DIR}\EdkIfrSupportLib.msa"/>

+      <OutputDirSetup baseName="EdkIfrSupportLib" mbdFilename="${MODULE_DIR}/EdkIfrSupportLib.mbd" msaFilename="${MODULE_DIR}/EdkIfrSupportLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkIfrSupportLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkIfrSupportLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkIfrSupportLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkIfrSupportLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkMemoryStatusCodeLib/build.xml b/EdkModulePkg/Library/EdkMemoryStatusCodeLib/build.xml
index 40db09a722..1efd30477d 100644
--- a/EdkModulePkg/Library/EdkMemoryStatusCodeLib/build.xml
+++ b/EdkModulePkg/Library/EdkMemoryStatusCodeLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkMemoryStatusCodeLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkMemoryStatusCodeLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkMemoryStatusCodeLib">

-      <GenBuild baseName="EdkMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}\EdkMemoryStatusCodeLib.mbd" msaFilename="${MODULE_DIR}\EdkMemoryStatusCodeLib.msa"/>

+      <GenBuild baseName="EdkMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.msa"/>

    </target>

    <target depends="EdkMemoryStatusCodeLib_clean" name="clean"/>

    <target depends="EdkMemoryStatusCodeLib_cleanall" name="cleanall"/>

    <target name="EdkMemoryStatusCodeLib_clean">

-      <OutputDirSetup baseName="EdkMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}\EdkMemoryStatusCodeLib.mbd" msaFilename="${MODULE_DIR}\EdkMemoryStatusCodeLib.msa"/>

+      <OutputDirSetup baseName="EdkMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkMemoryStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkMemoryStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkMemoryStatusCodeLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkMemoryStatusCodeLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkMemoryStatusCodeLib_cleanall">

-      <OutputDirSetup baseName="EdkMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}\EdkMemoryStatusCodeLib.mbd" msaFilename="${MODULE_DIR}\EdkMemoryStatusCodeLib.msa"/>

+      <OutputDirSetup baseName="EdkMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkMemoryStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkMemoryStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkMemoryStatusCodeLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkMemoryStatusCodeLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/build.xml b/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/build.xml
index a8ae7fe640..815ab35c2d 100644
--- a/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/build.xml
+++ b/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkNullCustomizedDecompressLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkNullCustomizedDecompressLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkNullCustomizedDecompressLib">

-      <GenBuild baseName="EdkNullCustomizedDecompressLib" mbdFilename="${MODULE_DIR}\EdkNullCustomizedDecompressLib.mbd" msaFilename="${MODULE_DIR}\EdkNullCustomizedDecompressLib.msa"/>

+      <GenBuild baseName="EdkNullCustomizedDecompressLib" mbdFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.mbd" msaFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.msa"/>

    </target>

    <target depends="EdkNullCustomizedDecompressLib_clean" name="clean"/>

    <target depends="EdkNullCustomizedDecompressLib_cleanall" name="cleanall"/>

    <target name="EdkNullCustomizedDecompressLib_clean">

-      <OutputDirSetup baseName="EdkNullCustomizedDecompressLib" mbdFilename="${MODULE_DIR}\EdkNullCustomizedDecompressLib.mbd" msaFilename="${MODULE_DIR}\EdkNullCustomizedDecompressLib.msa"/>

+      <OutputDirSetup baseName="EdkNullCustomizedDecompressLib" mbdFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.mbd" msaFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkNullCustomizedDecompressLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkNullCustomizedDecompressLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkNullCustomizedDecompressLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkNullCustomizedDecompressLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkNullCustomizedDecompressLib_cleanall">

-      <OutputDirSetup baseName="EdkNullCustomizedDecompressLib" mbdFilename="${MODULE_DIR}\EdkNullCustomizedDecompressLib.mbd" msaFilename="${MODULE_DIR}\EdkNullCustomizedDecompressLib.msa"/>

+      <OutputDirSetup baseName="EdkNullCustomizedDecompressLib" mbdFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.mbd" msaFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkNullCustomizedDecompressLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkNullCustomizedDecompressLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkNullCustomizedDecompressLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkNullCustomizedDecompressLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkPeCoffLoaderLib/build.xml b/EdkModulePkg/Library/EdkPeCoffLoaderLib/build.xml
index 6e7a34f37b..f3339fe44a 100644
--- a/EdkModulePkg/Library/EdkPeCoffLoaderLib/build.xml
+++ b/EdkModulePkg/Library/EdkPeCoffLoaderLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkPeCoffLoaderLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkPeCoffLoaderLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkPeCoffLoaderLib">

-      <GenBuild baseName="EdkPeCoffLoaderLib" mbdFilename="${MODULE_DIR}\EdkPeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}\EdkPeCoffLoaderLib.msa"/>

+      <GenBuild baseName="EdkPeCoffLoaderLib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.msa"/>

    </target>

    <target depends="EdkPeCoffLoaderLib_clean" name="clean"/>

    <target depends="EdkPeCoffLoaderLib_cleanall" name="cleanall"/>

    <target name="EdkPeCoffLoaderLib_clean">

-      <OutputDirSetup baseName="EdkPeCoffLoaderLib" mbdFilename="${MODULE_DIR}\EdkPeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}\EdkPeCoffLoaderLib.msa"/>

+      <OutputDirSetup baseName="EdkPeCoffLoaderLib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkPeCoffLoaderLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkPeCoffLoaderLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkPeCoffLoaderLib_cleanall">

-      <OutputDirSetup baseName="EdkPeCoffLoaderLib" mbdFilename="${MODULE_DIR}\EdkPeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}\EdkPeCoffLoaderLib.msa"/>

+      <OutputDirSetup baseName="EdkPeCoffLoaderLib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkPeCoffLoaderLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkPeCoffLoaderLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkPeCoffLoaderX64Lib/build.xml b/EdkModulePkg/Library/EdkPeCoffLoaderX64Lib/build.xml
index c72e03e73e..7114597571 100644
--- a/EdkModulePkg/Library/EdkPeCoffLoaderX64Lib/build.xml
+++ b/EdkModulePkg/Library/EdkPeCoffLoaderX64Lib/build.xml
@@ -10,31 +10,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="GenBuild.tasks"/>

    <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\EdkPeCoffLoaderX64Lib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkPeCoffLoaderX64Lib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkPeCoffLoaderX64Lib">

-      <GenBuild baseName="EdkPeCoffLoaderX64Lib" mbdFilename="${MODULE_DIR}\EdkPeCoffLoaderX64Lib.mbd" msaFilename="${MODULE_DIR}\EdkPeCoffLoaderX64Lib.msa"/>

+      <GenBuild baseName="EdkPeCoffLoaderX64Lib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.msa"/>

    </target>

    <target depends="EdkPeCoffLoaderX64Lib_clean" name="clean"/>

    <target depends="EdkPeCoffLoaderX64Lib_cleanAll" name="cleanAll"/>

    <target name="EdkPeCoffLoaderX64Lib_clean">

-      <OutputDirSetup baseName="EdkPeCoffLoaderX64Lib" mbdFilename="${MODULE_DIR}\EdkPeCoffLoaderX64Lib.mbd" msaFilename="${MODULE_DIR}\EdkPeCoffLoaderX64Lib.msa"/>

+      <OutputDirSetup baseName="EdkPeCoffLoaderX64Lib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkPeCoffLoaderX64Lib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderX64Lib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkPeCoffLoaderX64Lib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderX64Lib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkPeCoffLoaderX64Lib_cleanAll">

-      <OutputDirSetup baseName="EdkPeCoffLoaderX64Lib" mbdFilename="${MODULE_DIR}\EdkPeCoffLoaderX64Lib.mbd" msaFilename="${MODULE_DIR}\EdkPeCoffLoaderX64Lib.msa"/>

+      <OutputDirSetup baseName="EdkPeCoffLoaderX64Lib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkPeCoffLoaderX64Lib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderX64Lib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkPeCoffLoaderX64Lib_build.xml" target="cleanAll"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderX64Lib_build.xml" target="cleanAll"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkPeiPerformanceLib/build.xml b/EdkModulePkg/Library/EdkPeiPerformanceLib/build.xml
index 8b476daa7e..e269b31cd1 100644
--- a/EdkModulePkg/Library/EdkPeiPerformanceLib/build.xml
+++ b/EdkModulePkg/Library/EdkPeiPerformanceLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkPeiPerformanceLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkPeiPerformanceLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkPeiPerformanceLib">

-      <GenBuild baseName="EdkPeiPerformanceLib" mbdFilename="${MODULE_DIR}\EdkPeiPerformanceLib.mbd" msaFilename="${MODULE_DIR}\EdkPeiPerformanceLib.msa"/>

+      <GenBuild baseName="EdkPeiPerformanceLib" mbdFilename="${MODULE_DIR}/EdkPeiPerformanceLib.mbd" msaFilename="${MODULE_DIR}/EdkPeiPerformanceLib.msa"/>

    </target>

    <target depends="EdkPeiPerformanceLib_clean" name="clean"/>

    <target depends="EdkPeiPerformanceLib_cleanall" name="cleanall"/>

    <target name="EdkPeiPerformanceLib_clean">

-      <OutputDirSetup baseName="EdkPeiPerformanceLib" mbdFilename="${MODULE_DIR}\EdkPeiPerformanceLib.mbd" msaFilename="${MODULE_DIR}\EdkPeiPerformanceLib.msa"/>

+      <OutputDirSetup baseName="EdkPeiPerformanceLib" mbdFilename="${MODULE_DIR}/EdkPeiPerformanceLib.mbd" msaFilename="${MODULE_DIR}/EdkPeiPerformanceLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkPeiPerformanceLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkPeiPerformanceLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkPeiPerformanceLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeiPerformanceLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkPeiPerformanceLib_cleanall">

-      <OutputDirSetup baseName="EdkPeiPerformanceLib" mbdFilename="${MODULE_DIR}\EdkPeiPerformanceLib.mbd" msaFilename="${MODULE_DIR}\EdkPeiPerformanceLib.msa"/>

+      <OutputDirSetup baseName="EdkPeiPerformanceLib" mbdFilename="${MODULE_DIR}/EdkPeiPerformanceLib.mbd" msaFilename="${MODULE_DIR}/EdkPeiPerformanceLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkPeiPerformanceLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkPeiPerformanceLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkPeiPerformanceLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeiPerformanceLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/build.xml b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/build.xml
index 308ca95b11..4c7f99b78e 100644
--- a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/build.xml
+++ b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkRuntimeStatusCodeLib\BsDataHubStatusCode"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkBsDataHubStatusCodeLib">

-      <GenBuild baseName="EdkBsDataHubStatusCodeLib" mbdFilename="${MODULE_DIR}\BsDataHubStatusCode.mbd" msaFilename="${MODULE_DIR}\BsDataHubStatusCode.msa"/>

+      <GenBuild baseName="EdkBsDataHubStatusCodeLib" mbdFilename="${MODULE_DIR}/BsDataHubStatusCode.mbd" msaFilename="${MODULE_DIR}/BsDataHubStatusCode.msa"/>

    </target>

    <target depends="EdkBsDataHubStatusCodeLib_clean" name="clean"/>

    <target depends="EdkBsDataHubStatusCodeLib_cleanall" name="cleanall"/>

    <target name="EdkBsDataHubStatusCodeLib_clean">

-      <OutputDirSetup baseName="EdkBsDataHubStatusCodeLib" mbdFilename="${MODULE_DIR}\BsDataHubStatusCode.mbd" msaFilename="${MODULE_DIR}\BsDataHubStatusCode.msa"/>

+      <OutputDirSetup baseName="EdkBsDataHubStatusCodeLib" mbdFilename="${MODULE_DIR}/BsDataHubStatusCode.mbd" msaFilename="${MODULE_DIR}/BsDataHubStatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkBsDataHubStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkBsDataHubStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkBsDataHubStatusCodeLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkBsDataHubStatusCodeLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkBsDataHubStatusCodeLib_cleanall">

-      <OutputDirSetup baseName="EdkBsDataHubStatusCodeLib" mbdFilename="${MODULE_DIR}\BsDataHubStatusCode.mbd" msaFilename="${MODULE_DIR}\BsDataHubStatusCode.msa"/>

+      <OutputDirSetup baseName="EdkBsDataHubStatusCodeLib" mbdFilename="${MODULE_DIR}/BsDataHubStatusCode.mbd" msaFilename="${MODULE_DIR}/BsDataHubStatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkBsDataHubStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkBsDataHubStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkBsDataHubStatusCodeLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkBsDataHubStatusCodeLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode/build.xml b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode/build.xml
index 0f02e4e8f7..5152c1447b 100644
--- a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode/build.xml
+++ b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkRuntimeStatusCodeLib\RtMemoryStatusCode"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkRtMemoryStatusCodeLib">

-      <GenBuild baseName="EdkRtMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}\RtMemoryStatusCode.mbd" msaFilename="${MODULE_DIR}\RtMemoryStatusCode.msa"/>

+      <GenBuild baseName="EdkRtMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/RtMemoryStatusCode.mbd" msaFilename="${MODULE_DIR}/RtMemoryStatusCode.msa"/>

    </target>

    <target depends="EdkRtMemoryStatusCodeLib_clean" name="clean"/>

    <target depends="EdkRtMemoryStatusCodeLib_cleanall" name="cleanall"/>

    <target name="EdkRtMemoryStatusCodeLib_clean">

-      <OutputDirSetup baseName="EdkRtMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}\RtMemoryStatusCode.mbd" msaFilename="${MODULE_DIR}\RtMemoryStatusCode.msa"/>

+      <OutputDirSetup baseName="EdkRtMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/RtMemoryStatusCode.mbd" msaFilename="${MODULE_DIR}/RtMemoryStatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkRtMemoryStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkRtMemoryStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkRtMemoryStatusCodeLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkRtMemoryStatusCodeLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkRtMemoryStatusCodeLib_cleanall">

-      <OutputDirSetup baseName="EdkRtMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}\RtMemoryStatusCode.mbd" msaFilename="${MODULE_DIR}\RtMemoryStatusCode.msa"/>

+      <OutputDirSetup baseName="EdkRtMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/RtMemoryStatusCode.mbd" msaFilename="${MODULE_DIR}/RtMemoryStatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkRtMemoryStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkRtMemoryStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkRtMemoryStatusCodeLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkRtMemoryStatusCodeLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode/build.xml b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode/build.xml
index 34d4d7563c..2cffff0785 100644
--- a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode/build.xml
+++ b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkRuntimeStatusCodeLib\RtPlatformStatusCode"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkRtPlatformStatusCodeLib">

-      <GenBuild baseName="EdkRtPlatformStatusCodeLib" mbdFilename="${MODULE_DIR}\RtPlatformStatusCode.mbd" msaFilename="${MODULE_DIR}\RtPlatformStatusCode.msa"/>

+      <GenBuild baseName="EdkRtPlatformStatusCodeLib" mbdFilename="${MODULE_DIR}/RtPlatformStatusCode.mbd" msaFilename="${MODULE_DIR}/RtPlatformStatusCode.msa"/>

    </target>

    <target depends="EdkRtPlatformStatusCodeLib_clean" name="clean"/>

    <target depends="EdkRtPlatformStatusCodeLib_cleanall" name="cleanall"/>

    <target name="EdkRtPlatformStatusCodeLib_clean">

-      <OutputDirSetup baseName="EdkRtPlatformStatusCodeLib" mbdFilename="${MODULE_DIR}\RtPlatformStatusCode.mbd" msaFilename="${MODULE_DIR}\RtPlatformStatusCode.msa"/>

+      <OutputDirSetup baseName="EdkRtPlatformStatusCodeLib" mbdFilename="${MODULE_DIR}/RtPlatformStatusCode.mbd" msaFilename="${MODULE_DIR}/RtPlatformStatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkRtPlatformStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkRtPlatformStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkRtPlatformStatusCodeLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkRtPlatformStatusCodeLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkRtPlatformStatusCodeLib_cleanall">

-      <OutputDirSetup baseName="EdkRtPlatformStatusCodeLib" mbdFilename="${MODULE_DIR}\RtPlatformStatusCode.mbd" msaFilename="${MODULE_DIR}\RtPlatformStatusCode.msa"/>

+      <OutputDirSetup baseName="EdkRtPlatformStatusCodeLib" mbdFilename="${MODULE_DIR}/RtPlatformStatusCode.mbd" msaFilename="${MODULE_DIR}/RtPlatformStatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkRtPlatformStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkRtPlatformStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkRtPlatformStatusCodeLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkRtPlatformStatusCodeLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkScsiLib/build.xml b/EdkModulePkg/Library/EdkScsiLib/build.xml
index 511cf6fb7c..56e97015f3 100644
--- a/EdkModulePkg/Library/EdkScsiLib/build.xml
+++ b/EdkModulePkg/Library/EdkScsiLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkScsiLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkScsiLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkScsiLib">

-      <GenBuild baseName="EdkScsiLib" mbdFilename="${MODULE_DIR}\EdkScsiLib.mbd" msaFilename="${MODULE_DIR}\EdkScsiLib.msa"/>

+      <GenBuild baseName="EdkScsiLib" mbdFilename="${MODULE_DIR}/EdkScsiLib.mbd" msaFilename="${MODULE_DIR}/EdkScsiLib.msa"/>

    </target>

    <target depends="EdkScsiLib_clean" name="clean"/>

    <target depends="EdkScsiLib_cleanall" name="cleanall"/>

    <target name="EdkScsiLib_clean">

-      <OutputDirSetup baseName="EdkScsiLib" mbdFilename="${MODULE_DIR}\EdkScsiLib.mbd" msaFilename="${MODULE_DIR}\EdkScsiLib.msa"/>

+      <OutputDirSetup baseName="EdkScsiLib" mbdFilename="${MODULE_DIR}/EdkScsiLib.mbd" msaFilename="${MODULE_DIR}/EdkScsiLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkScsiLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkScsiLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkScsiLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkScsiLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkScsiLib_cleanall">

-      <OutputDirSetup baseName="EdkScsiLib" mbdFilename="${MODULE_DIR}\EdkScsiLib.mbd" msaFilename="${MODULE_DIR}\EdkScsiLib.msa"/>

+      <OutputDirSetup baseName="EdkScsiLib" mbdFilename="${MODULE_DIR}/EdkScsiLib.mbd" msaFilename="${MODULE_DIR}/EdkScsiLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkScsiLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkScsiLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkScsiLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkScsiLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/build.xml b/EdkModulePkg/Library/EdkUefiDebugLibConOut/build.xml
index 4a7cb25121..864a64f71a 100644
--- a/EdkModulePkg/Library/EdkUefiDebugLibConOut/build.xml
+++ b/EdkModulePkg/Library/EdkUefiDebugLibConOut/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkUefiDebugLibConOut"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkUefiDebugLibConOut"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkUefiDebugLibConOut">

-      <GenBuild baseName="EdkUefiDebugLibConOut" mbdFilename="${MODULE_DIR}\EdkUefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}\EdkUefiDebugLibConOut.msa"/>

+      <GenBuild baseName="EdkUefiDebugLibConOut" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.msa"/>

    </target>

    <target depends="EdkUefiDebugLibConOut_clean" name="clean"/>

    <target depends="EdkUefiDebugLibConOut_cleanall" name="cleanall"/>

    <target name="EdkUefiDebugLibConOut_clean">

-      <OutputDirSetup baseName="EdkUefiDebugLibConOut" mbdFilename="${MODULE_DIR}\EdkUefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}\EdkUefiDebugLibConOut.msa"/>

+      <OutputDirSetup baseName="EdkUefiDebugLibConOut" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkUefiDebugLibConOut_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkUefiDebugLibConOut_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkUefiDebugLibConOut_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkUefiDebugLibConOut_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkUefiDebugLibConOut_cleanall">

-      <OutputDirSetup baseName="EdkUefiDebugLibConOut" mbdFilename="${MODULE_DIR}\EdkUefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}\EdkUefiDebugLibConOut.msa"/>

+      <OutputDirSetup baseName="EdkUefiDebugLibConOut" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkUefiDebugLibConOut_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkUefiDebugLibConOut_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkUefiDebugLibConOut_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkUefiDebugLibConOut_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/build.xml b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/build.xml
index 1479581406..20eb35128b 100644
--- a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/build.xml
+++ b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkUefiDebugLibStdErr"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkUefiDebugLibStdErr"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkUefiDebugLibStdErr">

-      <GenBuild baseName="EdkUefiDebugLibStdErr" mbdFilename="${MODULE_DIR}\EdkUefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}\EdkUefiDebugLibStdErr.msa"/>

+      <GenBuild baseName="EdkUefiDebugLibStdErr" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.msa"/>

    </target>

    <target depends="EdkUefiDebugLibStdErr_clean" name="clean"/>

    <target depends="EdkUefiDebugLibStdErr_cleanall" name="cleanall"/>

    <target name="EdkUefiDebugLibStdErr_clean">

-      <OutputDirSetup baseName="EdkUefiDebugLibStdErr" mbdFilename="${MODULE_DIR}\EdkUefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}\EdkUefiDebugLibStdErr.msa"/>

+      <OutputDirSetup baseName="EdkUefiDebugLibStdErr" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkUefiDebugLibStdErr_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkUefiDebugLibStdErr_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkUefiDebugLibStdErr_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkUefiDebugLibStdErr_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkUefiDebugLibStdErr_cleanall">

-      <OutputDirSetup baseName="EdkUefiDebugLibStdErr" mbdFilename="${MODULE_DIR}\EdkUefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}\EdkUefiDebugLibStdErr.msa"/>

+      <OutputDirSetup baseName="EdkUefiDebugLibStdErr" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkUefiDebugLibStdErr_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkUefiDebugLibStdErr_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkUefiDebugLibStdErr_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkUefiDebugLibStdErr_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Library/EdkUsbLib/build.xml b/EdkModulePkg/Library/EdkUsbLib/build.xml
index 0b9eaade6b..501838adfd 100644
--- a/EdkModulePkg/Library/EdkUsbLib/build.xml
+++ b/EdkModulePkg/Library/EdkUsbLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\EdkUsbLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/EdkUsbLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EdkUsbLib">

-      <GenBuild baseName="EdkUsbLib" mbdFilename="${MODULE_DIR}\EdkUsbLib.mbd" msaFilename="${MODULE_DIR}\EdkUsbLib.msa"/>

+      <GenBuild baseName="EdkUsbLib" mbdFilename="${MODULE_DIR}/EdkUsbLib.mbd" msaFilename="${MODULE_DIR}/EdkUsbLib.msa"/>

    </target>

    <target depends="EdkUsbLib_clean" name="clean"/>

    <target depends="EdkUsbLib_cleanall" name="cleanall"/>

    <target name="EdkUsbLib_clean">

-      <OutputDirSetup baseName="EdkUsbLib" mbdFilename="${MODULE_DIR}\EdkUsbLib.mbd" msaFilename="${MODULE_DIR}\EdkUsbLib.msa"/>

+      <OutputDirSetup baseName="EdkUsbLib" mbdFilename="${MODULE_DIR}/EdkUsbLib.mbd" msaFilename="${MODULE_DIR}/EdkUsbLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkUsbLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkUsbLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkUsbLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkUsbLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EdkUsbLib_cleanall">

-      <OutputDirSetup baseName="EdkUsbLib" mbdFilename="${MODULE_DIR}\EdkUsbLib.mbd" msaFilename="${MODULE_DIR}\EdkUsbLib.msa"/>

+      <OutputDirSetup baseName="EdkUsbLib" mbdFilename="${MODULE_DIR}/EdkUsbLib.mbd" msaFilename="${MODULE_DIR}/EdkUsbLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EdkUsbLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EdkUsbLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EdkUsbLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EdkUsbLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/build.xml b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/build.xml
index b49ce9027c..dc1058aabd 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/build.xml
@@ -11,44 +11,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Console\ConSplitter\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Console/ConSplitter/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="ConSplitter">

-      <GenBuild baseName="ConSplitter" mbdFilename="${MODULE_DIR}\ConSplitter.mbd" msaFilename="${MODULE_DIR}\ConSplitter.msa"/>

+      <GenBuild baseName="ConSplitter" mbdFilename="${MODULE_DIR}/ConSplitter.mbd" msaFilename="${MODULE_DIR}/ConSplitter.msa"/>

    </target>

    <target name="ConSplitterLite">

-      <GenBuild baseName="ConSplitterLite" mbdFilename="${MODULE_DIR}\ConSplitterLite.mbd" msaFilename="${MODULE_DIR}\ConSplitterLite.msa"/>

+      <GenBuild baseName="ConSplitterLite" mbdFilename="${MODULE_DIR}/ConSplitterLite.mbd" msaFilename="${MODULE_DIR}/ConSplitterLite.msa"/>

    </target>

    <target depends="ConSplitter_clean" name="clean"/>

    <target depends="ConSplitter_cleanall" name="cleanall"/>

    <target name="ConSplitter_clean">

-      <OutputDirSetup baseName="ConSplitter" mbdFilename="${MODULE_DIR}\ConSplitter.mbd" msaFilename="${MODULE_DIR}\ConSplitter.msa"/>

+      <OutputDirSetup baseName="ConSplitter" mbdFilename="${MODULE_DIR}/ConSplitter.mbd" msaFilename="${MODULE_DIR}/ConSplitter.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ConSplitter_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ConSplitter_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ConSplitter_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ConSplitter_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="ConSplitterLite_clean">

-      <OutputDirSetup baseName="ConSplitterLite" mbdFilename="${MODULE_DIR}\ConSplitterLite.mbd" msaFilename="${MODULE_DIR}\ConSplitterLite.msa"/>

+      <OutputDirSetup baseName="ConSplitterLite" mbdFilename="${MODULE_DIR}/ConSplitterLite.mbd" msaFilename="${MODULE_DIR}/ConSplitterLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ConSplitterLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ConSplitterLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ConSplitterLite_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ConSplitterLite_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="ConSplitter_cleanall">

-      <OutputDirSetup baseName="ConSplitter" mbdFilename="${MODULE_DIR}\ConSplitter.mbd" msaFilename="${MODULE_DIR}\ConSplitter.msa"/>

+      <OutputDirSetup baseName="ConSplitter" mbdFilename="${MODULE_DIR}/ConSplitter.mbd" msaFilename="${MODULE_DIR}/ConSplitter.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ConSplitter_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ConSplitter_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ConSplitter_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ConSplitter_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

@@ -58,11 +58,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
       </delete>

    </target>

    <target name="ConSplitterLite_cleanall">

-      <OutputDirSetup baseName="ConSplitterLite" mbdFilename="${MODULE_DIR}\ConSplitterLite.mbd" msaFilename="${MODULE_DIR}\ConSplitterLite.msa"/>

+      <OutputDirSetup baseName="ConSplitterLite" mbdFilename="${MODULE_DIR}/ConSplitterLite.mbd" msaFilename="${MODULE_DIR}/ConSplitterLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ConSplitterLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ConSplitterLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ConSplitterLite_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ConSplitterLite_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/build.xml b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/build.xml
index 896302767b..852b17b3a4 100644
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Console\GraphicsConsole\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Console/GraphicsConsole/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="GraphicsConsole">

-      <GenBuild baseName="GraphicsConsole" mbdFilename="${MODULE_DIR}\GraphicsConsole.mbd" msaFilename="${MODULE_DIR}\GraphicsConsole.msa"/>

+      <GenBuild baseName="GraphicsConsole" mbdFilename="${MODULE_DIR}/GraphicsConsole.mbd" msaFilename="${MODULE_DIR}/GraphicsConsole.msa"/>

    </target>

    <target depends="GraphicsConsole_clean" name="clean"/>

    <target depends="GraphicsConsole_cleanall" name="cleanall"/>

    <target name="GraphicsConsole_clean">

-      <OutputDirSetup baseName="GraphicsConsole" mbdFilename="${MODULE_DIR}\GraphicsConsole.mbd" msaFilename="${MODULE_DIR}\GraphicsConsole.msa"/>

+      <OutputDirSetup baseName="GraphicsConsole" mbdFilename="${MODULE_DIR}/GraphicsConsole.mbd" msaFilename="${MODULE_DIR}/GraphicsConsole.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\GraphicsConsole_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/GraphicsConsole_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\GraphicsConsole_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/GraphicsConsole_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="GraphicsConsole_cleanall">

-      <OutputDirSetup baseName="GraphicsConsole" mbdFilename="${MODULE_DIR}\GraphicsConsole.mbd" msaFilename="${MODULE_DIR}\GraphicsConsole.msa"/>

+      <OutputDirSetup baseName="GraphicsConsole" mbdFilename="${MODULE_DIR}/GraphicsConsole.mbd" msaFilename="${MODULE_DIR}/GraphicsConsole.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\GraphicsConsole_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/GraphicsConsole_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\GraphicsConsole_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/GraphicsConsole_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/build.xml b/EdkModulePkg/Universal/Console/Terminal/Dxe/build.xml
index a3c17133de..e9d06dd7db 100644
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Console\Terminal\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Console/Terminal/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Terminal">

-      <GenBuild baseName="Terminal" mbdFilename="${MODULE_DIR}\Terminal.mbd" msaFilename="${MODULE_DIR}\Terminal.msa"/>

+      <GenBuild baseName="Terminal" mbdFilename="${MODULE_DIR}/Terminal.mbd" msaFilename="${MODULE_DIR}/Terminal.msa"/>

    </target>

    <target depends="Terminal_clean" name="clean"/>

    <target depends="Terminal_cleanall" name="cleanall"/>

    <target name="Terminal_clean">

-      <OutputDirSetup baseName="Terminal" mbdFilename="${MODULE_DIR}\Terminal.mbd" msaFilename="${MODULE_DIR}\Terminal.msa"/>

+      <OutputDirSetup baseName="Terminal" mbdFilename="${MODULE_DIR}/Terminal.mbd" msaFilename="${MODULE_DIR}/Terminal.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Terminal_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Terminal_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Terminal_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Terminal_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Terminal_cleanall">

-      <OutputDirSetup baseName="Terminal" mbdFilename="${MODULE_DIR}\Terminal.mbd" msaFilename="${MODULE_DIR}\Terminal.msa"/>

+      <OutputDirSetup baseName="Terminal" mbdFilename="${MODULE_DIR}/Terminal.mbd" msaFilename="${MODULE_DIR}/Terminal.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Terminal_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Terminal_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Terminal_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Terminal_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/build.xml b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/build.xml
index 9d59b30b4b..fcf00f8df1 100644
--- a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/build.xml
+++ b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\DataHub\DataHub\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/DataHub/DataHub/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DataHub">

-      <GenBuild baseName="DataHub" mbdFilename="${MODULE_DIR}\DataHub.mbd" msaFilename="${MODULE_DIR}\DataHub.msa"/>

+      <GenBuild baseName="DataHub" mbdFilename="${MODULE_DIR}/DataHub.mbd" msaFilename="${MODULE_DIR}/DataHub.msa"/>

    </target>

    <target depends="DataHub_clean" name="clean"/>

    <target depends="DataHub_cleanall" name="cleanall"/>

    <target name="DataHub_clean">

-      <OutputDirSetup baseName="DataHub" mbdFilename="${MODULE_DIR}\DataHub.mbd" msaFilename="${MODULE_DIR}\DataHub.msa"/>

+      <OutputDirSetup baseName="DataHub" mbdFilename="${MODULE_DIR}/DataHub.mbd" msaFilename="${MODULE_DIR}/DataHub.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DataHub_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DataHub_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DataHub_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DataHub_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DataHub_cleanall">

-      <OutputDirSetup baseName="DataHub" mbdFilename="${MODULE_DIR}\DataHub.mbd" msaFilename="${MODULE_DIR}\DataHub.msa"/>

+      <OutputDirSetup baseName="DataHub" mbdFilename="${MODULE_DIR}/DataHub.mbd" msaFilename="${MODULE_DIR}/DataHub.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DataHub_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DataHub_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DataHub_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DataHub_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/build.xml b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/build.xml
index 22bea3fd3b..e712520ca3 100644
--- a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/build.xml
+++ b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\DataHub\DataHubStdErr\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/DataHub/DataHubStdErr/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DataHubStdErr">

-      <GenBuild baseName="DataHubStdErr" mbdFilename="${MODULE_DIR}\DataHubStdErr.mbd" msaFilename="${MODULE_DIR}\DataHubStdErr.msa"/>

+      <GenBuild baseName="DataHubStdErr" mbdFilename="${MODULE_DIR}/DataHubStdErr.mbd" msaFilename="${MODULE_DIR}/DataHubStdErr.msa"/>

    </target>

    <target depends="DataHubStdErr_clean" name="clean"/>

    <target depends="DataHubStdErr_cleanall" name="cleanall"/>

    <target name="DataHubStdErr_clean">

-      <OutputDirSetup baseName="DataHubStdErr" mbdFilename="${MODULE_DIR}\DataHubStdErr.mbd" msaFilename="${MODULE_DIR}\DataHubStdErr.msa"/>

+      <OutputDirSetup baseName="DataHubStdErr" mbdFilename="${MODULE_DIR}/DataHubStdErr.mbd" msaFilename="${MODULE_DIR}/DataHubStdErr.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DataHubStdErr_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DataHubStdErr_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DataHubStdErr_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DataHubStdErr_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DataHubStdErr_cleanall">

-      <OutputDirSetup baseName="DataHubStdErr" mbdFilename="${MODULE_DIR}\DataHubStdErr.mbd" msaFilename="${MODULE_DIR}\DataHubStdErr.msa"/>

+      <OutputDirSetup baseName="DataHubStdErr" mbdFilename="${MODULE_DIR}/DataHubStdErr.mbd" msaFilename="${MODULE_DIR}/DataHubStdErr.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DataHubStdErr_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DataHubStdErr_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DataHubStdErr_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DataHubStdErr_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
index 3cf5e12299..1986c1d835 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
@@ -42,14 +42,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>DebugSupport.c</Filename>

     <Filename>DebugSupport.dxs</Filename>

     <Arch ArchType="IA32">

-      <Filename>ia32\AsmFuncs.asm</Filename>

-      <Filename>ia32\plDebugSupport.c</Filename>

+      <Filename>ia32/AsmFuncs.asm</Filename>

+      <Filename>ia32/plDebugSupport.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>ipf\AsmFuncs.s</Filename>

-      <Filename>ipf\common.i</Filename>

-      <Filename>ipf\ds64macros.i</Filename>

-      <Filename>ipf\plDebugSupport.c</Filename>

+      <Filename>ipf/AsmFuncs.s</Filename>

+      <Filename>ipf/common.i</Filename>

+      <Filename>ipf/ds64macros.i</Filename>

+      <Filename>ipf/plDebugSupport.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/build.xml b/EdkModulePkg/Universal/DebugSupport/Dxe/build.xml
index b879fc094a..06a7f1de7b 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/build.xml
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\DebugSupport\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/DebugSupport/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DebugSupport">

-      <GenBuild baseName="DebugSupport" mbdFilename="${MODULE_DIR}\DebugSupport.mbd" msaFilename="${MODULE_DIR}\DebugSupport.msa"/>

+      <GenBuild baseName="DebugSupport" mbdFilename="${MODULE_DIR}/DebugSupport.mbd" msaFilename="${MODULE_DIR}/DebugSupport.msa"/>

    </target>

    <target depends="DebugSupport_clean" name="clean"/>

    <target depends="DebugSupport_cleanall" name="cleanall"/>

    <target name="DebugSupport_clean">

-      <OutputDirSetup baseName="DebugSupport" mbdFilename="${MODULE_DIR}\DebugSupport.mbd" msaFilename="${MODULE_DIR}\DebugSupport.msa"/>

+      <OutputDirSetup baseName="DebugSupport" mbdFilename="${MODULE_DIR}/DebugSupport.mbd" msaFilename="${MODULE_DIR}/DebugSupport.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DebugSupport_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DebugSupport_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DebugSupport_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DebugSupport_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DebugSupport_cleanall">

-      <OutputDirSetup baseName="DebugSupport" mbdFilename="${MODULE_DIR}\DebugSupport.mbd" msaFilename="${MODULE_DIR}\DebugSupport.msa"/>

+      <OutputDirSetup baseName="DebugSupport" mbdFilename="${MODULE_DIR}/DebugSupport.mbd" msaFilename="${MODULE_DIR}/DebugSupport.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DebugSupport_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DebugSupport_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DebugSupport_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DebugSupport_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/build.xml b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/build.xml
index 89b603c257..4b9c2e45b8 100644
--- a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Debugger\Debugport\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Debugger/Debugport/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DebugPort">

-      <GenBuild baseName="DebugPort" mbdFilename="${MODULE_DIR}\DebugPort.mbd" msaFilename="${MODULE_DIR}\DebugPort.msa"/>

+      <GenBuild baseName="DebugPort" mbdFilename="${MODULE_DIR}/DebugPort.mbd" msaFilename="${MODULE_DIR}/DebugPort.msa"/>

    </target>

    <target depends="DebugPort_clean" name="clean"/>

    <target depends="DebugPort_cleanall" name="cleanall"/>

    <target name="DebugPort_clean">

-      <OutputDirSetup baseName="DebugPort" mbdFilename="${MODULE_DIR}\DebugPort.mbd" msaFilename="${MODULE_DIR}\DebugPort.msa"/>

+      <OutputDirSetup baseName="DebugPort" mbdFilename="${MODULE_DIR}/DebugPort.mbd" msaFilename="${MODULE_DIR}/DebugPort.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DebugPort_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DebugPort_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DebugPort_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DebugPort_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DebugPort_cleanall">

-      <OutputDirSetup baseName="DebugPort" mbdFilename="${MODULE_DIR}\DebugPort.mbd" msaFilename="${MODULE_DIR}\DebugPort.msa"/>

+      <OutputDirSetup baseName="DebugPort" mbdFilename="${MODULE_DIR}/DebugPort.mbd" msaFilename="${MODULE_DIR}/DebugPort.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DebugPort_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DebugPort_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DebugPort_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DebugPort_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/build.xml b/EdkModulePkg/Universal/Disk/DiskIo/Dxe/build.xml
index 8a6ff7b7bc..6c19fe4059 100644
--- a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Disk/DiskIo/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Disk\DiskIo\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Disk/DiskIo/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DiskIo">

-      <GenBuild baseName="DiskIo" mbdFilename="${MODULE_DIR}\DiskIo.mbd" msaFilename="${MODULE_DIR}\DiskIo.msa"/>

+      <GenBuild baseName="DiskIo" mbdFilename="${MODULE_DIR}/DiskIo.mbd" msaFilename="${MODULE_DIR}/DiskIo.msa"/>

    </target>

    <target depends="DiskIo_clean" name="clean"/>

    <target depends="DiskIo_cleanall" name="cleanall"/>

    <target name="DiskIo_clean">

-      <OutputDirSetup baseName="DiskIo" mbdFilename="${MODULE_DIR}\DiskIo.mbd" msaFilename="${MODULE_DIR}\DiskIo.msa"/>

+      <OutputDirSetup baseName="DiskIo" mbdFilename="${MODULE_DIR}/DiskIo.mbd" msaFilename="${MODULE_DIR}/DiskIo.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DiskIo_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DiskIo_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DiskIo_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DiskIo_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DiskIo_cleanall">

-      <OutputDirSetup baseName="DiskIo" mbdFilename="${MODULE_DIR}\DiskIo.mbd" msaFilename="${MODULE_DIR}\DiskIo.msa"/>

+      <OutputDirSetup baseName="DiskIo" mbdFilename="${MODULE_DIR}/DiskIo.mbd" msaFilename="${MODULE_DIR}/DiskIo.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DiskIo_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DiskIo_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DiskIo_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DiskIo_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/DiskIoPartition.msa b/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/DiskIoPartition.msa
index 930f57b96a..55ca6c819c 100644
--- a/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/DiskIoPartition.msa
+++ b/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/DiskIoPartition.msa
@@ -43,18 +43,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">DevicePathLib</LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

-    <Filename>..\..\DiskIo\Dxe\diskio.c</Filename>

-    <Filename>..\..\DiskIo\Dxe\diskio.h</Filename>

-    <Filename>..\..\DiskIo\Dxe\ComponentName.c</Filename>

-    <Filename>..\..\Partition\Dxe\Partition.h</Filename>

-    <Filename>..\..\Partition\Dxe\ElTorito.h</Filename>

-    <Filename>..\..\Partition\Dxe\Gpt.h</Filename>

-    <Filename>..\..\Partition\Dxe\Mbr.h</Filename>

-    <Filename>..\..\Partition\Dxe\Partition.c</Filename>

-    <Filename>..\..\Partition\Dxe\Eltorito.c</Filename>

-    <Filename>..\..\Partition\Dxe\Gpt.c</Filename>

-    <Filename>..\..\Partition\Dxe\Mbr.c</Filename>

-    <Filename>..\..\Partition\Dxe\ComponentName.c</Filename>

+    <Filename>../../DiskIo/Dxe/diskio.c</Filename>

+    <Filename>../../DiskIo/Dxe/diskio.h</Filename>

+    <Filename>../../DiskIo/Dxe/ComponentName.c</Filename>

+    <Filename>../../Partition/Dxe/Partition.h</Filename>

+    <Filename>../../Partition/Dxe/ElTorito.h</Filename>

+    <Filename>../../Partition/Dxe/Gpt.h</Filename>

+    <Filename>../../Partition/Dxe/Mbr.h</Filename>

+    <Filename>../../Partition/Dxe/Partition.c</Filename>

+    <Filename>../../Partition/Dxe/Eltorito.c</Filename>

+    <Filename>../../Partition/Dxe/Gpt.c</Filename>

+    <Filename>../../Partition/Dxe/Mbr.c</Filename>

+    <Filename>../../Partition/Dxe/ComponentName.c</Filename>

   </SourceFiles>

   <Includes>

     <PackageName>MdePkg</PackageName>

diff --git a/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/build.xml b/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/build.xml
index 4b1c1f88cf..17994d8b04 100644
--- a/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/build.xml
+++ b/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Disk\DiskIoPartition\dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Disk/DiskIoPartition/dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DiskIoPartition">

-      <GenBuild baseName="DiskIoPartition" mbdFilename="${MODULE_DIR}\DiskIoPartition.mbd" msaFilename="${MODULE_DIR}\DiskIoPartition.msa"/>

+      <GenBuild baseName="DiskIoPartition" mbdFilename="${MODULE_DIR}/DiskIoPartition.mbd" msaFilename="${MODULE_DIR}/DiskIoPartition.msa"/>

    </target>

    <target depends="DiskIoPartition_clean" name="clean"/>

    <target depends="DiskIoPartition_cleanall" name="cleanall"/>

    <target name="DiskIoPartition_clean">

-      <OutputDirSetup baseName="DiskIoPartition" mbdFilename="${MODULE_DIR}\DiskIoPartition.mbd" msaFilename="${MODULE_DIR}\DiskIoPartition.msa"/>

+      <OutputDirSetup baseName="DiskIoPartition" mbdFilename="${MODULE_DIR}/DiskIoPartition.mbd" msaFilename="${MODULE_DIR}/DiskIoPartition.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DiskIoPartition_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DiskIoPartition_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DiskIoPartition_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DiskIoPartition_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DiskIoPartition_cleanall">

-      <OutputDirSetup baseName="DiskIoPartition" mbdFilename="${MODULE_DIR}\DiskIoPartition.mbd" msaFilename="${MODULE_DIR}\DiskIoPartition.msa"/>

+      <OutputDirSetup baseName="DiskIoPartition" mbdFilename="${MODULE_DIR}/DiskIoPartition.mbd" msaFilename="${MODULE_DIR}/DiskIoPartition.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DiskIoPartition_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DiskIoPartition_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DiskIoPartition_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DiskIoPartition_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Disk/Partition/Dxe/build.xml b/EdkModulePkg/Universal/Disk/Partition/Dxe/build.xml
index ea4ea4e1ed..42d5194c4e 100644
--- a/EdkModulePkg/Universal/Disk/Partition/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Disk/Partition/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Disk\Partition\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Disk/Partition/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Partition">

-      <GenBuild baseName="Partition" mbdFilename="${MODULE_DIR}\Partition.mbd" msaFilename="${MODULE_DIR}\Partition.msa"/>

+      <GenBuild baseName="Partition" mbdFilename="${MODULE_DIR}/Partition.mbd" msaFilename="${MODULE_DIR}/Partition.msa"/>

    </target>

    <target depends="Partition_clean" name="clean"/>

    <target depends="Partition_cleanall" name="cleanall"/>

    <target name="Partition_clean">

-      <OutputDirSetup baseName="Partition" mbdFilename="${MODULE_DIR}\Partition.mbd" msaFilename="${MODULE_DIR}\Partition.msa"/>

+      <OutputDirSetup baseName="Partition" mbdFilename="${MODULE_DIR}/Partition.mbd" msaFilename="${MODULE_DIR}/Partition.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Partition_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Partition_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Partition_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Partition_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Partition_cleanall">

-      <OutputDirSetup baseName="Partition" mbdFilename="${MODULE_DIR}\Partition.mbd" msaFilename="${MODULE_DIR}\Partition.msa"/>

+      <OutputDirSetup baseName="Partition" mbdFilename="${MODULE_DIR}/Partition.mbd" msaFilename="${MODULE_DIR}/Partition.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Partition_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Partition_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Partition_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Partition_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/build.xml b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/build.xml
index 81fd524667..ab86d5a16f 100644
--- a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Disk\UnicodeCollation\English\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Disk/UnicodeCollation/English/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="English">

-      <GenBuild baseName="English" mbdFilename="${MODULE_DIR}\English.mbd" msaFilename="${MODULE_DIR}\English.msa"/>

+      <GenBuild baseName="English" mbdFilename="${MODULE_DIR}/English.mbd" msaFilename="${MODULE_DIR}/English.msa"/>

    </target>

    <target depends="English_clean" name="clean"/>

    <target depends="English_cleanall" name="cleanall"/>

    <target name="English_clean">

-      <OutputDirSetup baseName="English" mbdFilename="${MODULE_DIR}\English.mbd" msaFilename="${MODULE_DIR}\English.msa"/>

+      <OutputDirSetup baseName="English" mbdFilename="${MODULE_DIR}/English.mbd" msaFilename="${MODULE_DIR}/English.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\English_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/English_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\English_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/English_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="English_cleanall">

-      <OutputDirSetup baseName="English" mbdFilename="${MODULE_DIR}\English.mbd" msaFilename="${MODULE_DIR}\English.msa"/>

+      <OutputDirSetup baseName="English" mbdFilename="${MODULE_DIR}/English.mbd" msaFilename="${MODULE_DIR}/English.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\English_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/English_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\English_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/English_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/Ebc.msa b/EdkModulePkg/Universal/Ebc/Dxe/Ebc.msa
index e736450b39..dcd073f4f9 100644
--- a/EdkModulePkg/Universal/Ebc/Dxe/Ebc.msa
+++ b/EdkModulePkg/Universal/Ebc/Dxe/Ebc.msa
@@ -48,20 +48,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>EbcExecute.h</Filename>

     <Filename>Ebc.dxs</Filename>

     <Arch ArchType="IA32">

-      <Filename>Ia32\EbcLowLevel.asm</Filename>

-      <Filename>Ia32\Ia32Math.asm</Filename>

-      <Filename>Ia32\EbcSupport.c</Filename>

+      <Filename>Ia32/EbcLowLevel.asm</Filename>

+      <Filename>Ia32/Ia32Math.asm</Filename>

+      <Filename>Ia32/EbcSupport.c</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>x64\EbcLowLevel.asm</Filename>

-      <Filename>x64\x64Math.c</Filename>

-      <Filename>x64\EbcSupport.c</Filename>

+      <Filename>x64/EbcLowLevel.asm</Filename>

+      <Filename>x64/x64Math.c</Filename>

+      <Filename>x64/EbcSupport.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\EbcLowLevel.s</Filename>

-      <Filename>Ipf\IpfMath.c</Filename>

-      <Filename>Ipf\IpfMul.s</Filename>

-      <Filename>Ipf\EbcSupport.c</Filename>

+      <Filename>Ipf/EbcLowLevel.s</Filename>

+      <Filename>Ipf/IpfMath.c</Filename>

+      <Filename>Ipf/IpfMul.s</Filename>

+      <Filename>Ipf/EbcSupport.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/build.xml b/EdkModulePkg/Universal/Ebc/Dxe/build.xml
index 2145923e2a..93f107b3f6 100644
--- a/EdkModulePkg/Universal/Ebc/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Ebc/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Ebc\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Ebc/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Ebc">

-      <GenBuild baseName="Ebc" mbdFilename="${MODULE_DIR}\Ebc.mbd" msaFilename="${MODULE_DIR}\Ebc.msa"/>

+      <GenBuild baseName="Ebc" mbdFilename="${MODULE_DIR}/Ebc.mbd" msaFilename="${MODULE_DIR}/Ebc.msa"/>

    </target>

    <target depends="Ebc_clean" name="clean"/>

    <target depends="Ebc_cleanall" name="cleanall"/>

    <target name="Ebc_clean">

-      <OutputDirSetup baseName="Ebc" mbdFilename="${MODULE_DIR}\Ebc.mbd" msaFilename="${MODULE_DIR}\Ebc.msa"/>

+      <OutputDirSetup baseName="Ebc" mbdFilename="${MODULE_DIR}/Ebc.mbd" msaFilename="${MODULE_DIR}/Ebc.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Ebc_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Ebc_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Ebc_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Ebc_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Ebc_cleanall">

-      <OutputDirSetup baseName="Ebc" mbdFilename="${MODULE_DIR}\Ebc.mbd" msaFilename="${MODULE_DIR}\Ebc.msa"/>

+      <OutputDirSetup baseName="Ebc" mbdFilename="${MODULE_DIR}/Ebc.mbd" msaFilename="${MODULE_DIR}/Ebc.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Ebc_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Ebc_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Ebc_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Ebc_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
index e5142bed73..937fa617dd 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
@@ -53,7 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Filename>InitVariable.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\InitVariable.c</Filename>

+      <Filename>Ipf/InitVariable.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/build.xml b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/build.xml
index b2767a2608..11153e69dc 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\EmuVariable\RuntimeDxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/EmuVariable/RuntimeDxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EmuVariable">

-      <GenBuild baseName="EmuVariable" mbdFilename="${MODULE_DIR}\EmuVariable.mbd" msaFilename="${MODULE_DIR}\EmuVariable.msa"/>

+      <GenBuild baseName="EmuVariable" mbdFilename="${MODULE_DIR}/EmuVariable.mbd" msaFilename="${MODULE_DIR}/EmuVariable.msa"/>

    </target>

    <target depends="EmuVariable_clean" name="clean"/>

    <target depends="EmuVariable_cleanall" name="cleanall"/>

    <target name="EmuVariable_clean">

-      <OutputDirSetup baseName="EmuVariable" mbdFilename="${MODULE_DIR}\EmuVariable.mbd" msaFilename="${MODULE_DIR}\EmuVariable.msa"/>

+      <OutputDirSetup baseName="EmuVariable" mbdFilename="${MODULE_DIR}/EmuVariable.mbd" msaFilename="${MODULE_DIR}/EmuVariable.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EmuVariable_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EmuVariable_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EmuVariable_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EmuVariable_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EmuVariable_cleanall">

-      <OutputDirSetup baseName="EmuVariable" mbdFilename="${MODULE_DIR}\EmuVariable.mbd" msaFilename="${MODULE_DIR}\EmuVariable.msa"/>

+      <OutputDirSetup baseName="EmuVariable" mbdFilename="${MODULE_DIR}/EmuVariable.mbd" msaFilename="${MODULE_DIR}/EmuVariable.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EmuVariable_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EmuVariable_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EmuVariable_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EmuVariable_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
index 06eb47c2a2..81cd125882 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
@@ -46,16 +46,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>FtwWorkSpace.c</Filename>

     <Filename>FtwLite.dxs</Filename>

     <Arch ArchType="IA32">

-      <Filename>ia32\Ia32FtwMisc.c</Filename>

+      <Filename>ia32/Ia32FtwMisc.c</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>x64\x64FtwMisc.c</Filename>

+      <Filename>x64/x64FtwMisc.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\IpfFtwMisc.c</Filename>

+      <Filename>Ipf/IpfFtwMisc.c</Filename>

     </Arch>

     <Arch ArchType="EBC">

-      <Filename>ia32\Ia32FtwMisc.c</Filename>

+      <Filename>ia32/Ia32FtwMisc.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/build.xml b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/build.xml
index 0883c25cba..37d04b5218 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/build.xml
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\FirmwareVolume\FaultTolerantWriteLite\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="FtwLite">

-      <GenBuild baseName="FtwLite" mbdFilename="${MODULE_DIR}\FtwLite.mbd" msaFilename="${MODULE_DIR}\FtwLite.msa"/>

+      <GenBuild baseName="FtwLite" mbdFilename="${MODULE_DIR}/FtwLite.mbd" msaFilename="${MODULE_DIR}/FtwLite.msa"/>

    </target>

    <target depends="FtwLite_clean" name="clean"/>

    <target depends="FtwLite_cleanall" name="cleanall"/>

    <target name="FtwLite_clean">

-      <OutputDirSetup baseName="FtwLite" mbdFilename="${MODULE_DIR}\FtwLite.mbd" msaFilename="${MODULE_DIR}\FtwLite.msa"/>

+      <OutputDirSetup baseName="FtwLite" mbdFilename="${MODULE_DIR}/FtwLite.mbd" msaFilename="${MODULE_DIR}/FtwLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\FtwLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/FtwLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\FtwLite_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/FtwLite_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="FtwLite_cleanall">

-      <OutputDirSetup baseName="FtwLite" mbdFilename="${MODULE_DIR}\FtwLite.mbd" msaFilename="${MODULE_DIR}\FtwLite.msa"/>

+      <OutputDirSetup baseName="FtwLite" mbdFilename="${MODULE_DIR}/FtwLite.mbd" msaFilename="${MODULE_DIR}/FtwLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\FtwLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/FtwLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\FtwLite_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/FtwLite_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/build.xml b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/build.xml
index 7582701719..774e588d9b 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/build.xml
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\FirmwareVolume\GuidedSectionExtraction\Crc32SectionExtract\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Crc32SectionExtract">

-      <GenBuild baseName="Crc32SectionExtract" mbdFilename="${MODULE_DIR}\Crc32SectionExtract.mbd" msaFilename="${MODULE_DIR}\Crc32SectionExtract.msa"/>

+      <GenBuild baseName="Crc32SectionExtract" mbdFilename="${MODULE_DIR}/Crc32SectionExtract.mbd" msaFilename="${MODULE_DIR}/Crc32SectionExtract.msa"/>

    </target>

    <target depends="Crc32SectionExtract_clean" name="clean"/>

    <target depends="Crc32SectionExtract_cleanall" name="cleanall"/>

    <target name="Crc32SectionExtract_clean">

-      <OutputDirSetup baseName="Crc32SectionExtract" mbdFilename="${MODULE_DIR}\Crc32SectionExtract.mbd" msaFilename="${MODULE_DIR}\Crc32SectionExtract.msa"/>

+      <OutputDirSetup baseName="Crc32SectionExtract" mbdFilename="${MODULE_DIR}/Crc32SectionExtract.mbd" msaFilename="${MODULE_DIR}/Crc32SectionExtract.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Crc32SectionExtract_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Crc32SectionExtract_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Crc32SectionExtract_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Crc32SectionExtract_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Crc32SectionExtract_cleanall">

-      <OutputDirSetup baseName="Crc32SectionExtract" mbdFilename="${MODULE_DIR}\Crc32SectionExtract.mbd" msaFilename="${MODULE_DIR}\Crc32SectionExtract.msa"/>

+      <OutputDirSetup baseName="Crc32SectionExtract" mbdFilename="${MODULE_DIR}/Crc32SectionExtract.mbd" msaFilename="${MODULE_DIR}/Crc32SectionExtract.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Crc32SectionExtract_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Crc32SectionExtract_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Crc32SectionExtract_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Crc32SectionExtract_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/build.xml b/EdkModulePkg/Universal/GenericMemoryTest/Dxe/build.xml
index c392081b01..0556891464 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/build.xml
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\GenericMemoryTest\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/GenericMemoryTest/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="NullMemoryTest">

-      <GenBuild baseName="NullMemoryTest" mbdFilename="${MODULE_DIR}\NullMemoryTest.mbd" msaFilename="${MODULE_DIR}\NullMemoryTest.msa"/>

+      <GenBuild baseName="NullMemoryTest" mbdFilename="${MODULE_DIR}/NullMemoryTest.mbd" msaFilename="${MODULE_DIR}/NullMemoryTest.msa"/>

    </target>

    <target depends="NullMemoryTest_clean" name="clean"/>

    <target depends="NullMemoryTest_cleanall" name="cleanall"/>

    <target name="NullMemoryTest_clean">

-      <OutputDirSetup baseName="NullMemoryTest" mbdFilename="${MODULE_DIR}\NullMemoryTest.mbd" msaFilename="${MODULE_DIR}\NullMemoryTest.msa"/>

+      <OutputDirSetup baseName="NullMemoryTest" mbdFilename="${MODULE_DIR}/NullMemoryTest.mbd" msaFilename="${MODULE_DIR}/NullMemoryTest.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\NullMemoryTest_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/NullMemoryTest_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\NullMemoryTest_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/NullMemoryTest_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="NullMemoryTest_cleanall">

-      <OutputDirSetup baseName="NullMemoryTest" mbdFilename="${MODULE_DIR}\NullMemoryTest.mbd" msaFilename="${MODULE_DIR}\NullMemoryTest.msa"/>

+      <OutputDirSetup baseName="NullMemoryTest" mbdFilename="${MODULE_DIR}/NullMemoryTest.mbd" msaFilename="${MODULE_DIR}/NullMemoryTest.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\NullMemoryTest_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/NullMemoryTest_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\NullMemoryTest_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/NullMemoryTest_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Pei/build.xml b/EdkModulePkg/Universal/GenericMemoryTest/Pei/build.xml
index 4a96b6bda8..cf6dfea127 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Pei/build.xml
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Pei/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\GenericMemoryTest\Pei"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/GenericMemoryTest/Pei"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiBaseMemoryTestInit">

-      <GenBuild baseName="PeiBaseMemoryTestInit" mbdFilename="${MODULE_DIR}\BaseMemoryTest.mbd" msaFilename="${MODULE_DIR}\BaseMemoryTest.msa"/>

+      <GenBuild baseName="PeiBaseMemoryTestInit" mbdFilename="${MODULE_DIR}/BaseMemoryTest.mbd" msaFilename="${MODULE_DIR}/BaseMemoryTest.msa"/>

    </target>

    <target depends="PeiBaseMemoryTestInit_clean" name="clean"/>

    <target depends="PeiBaseMemoryTestInit_cleanall" name="cleanall"/>

    <target name="PeiBaseMemoryTestInit_clean">

-      <OutputDirSetup baseName="PeiBaseMemoryTestInit" mbdFilename="${MODULE_DIR}\BaseMemoryTest.mbd" msaFilename="${MODULE_DIR}\BaseMemoryTest.msa"/>

+      <OutputDirSetup baseName="PeiBaseMemoryTestInit" mbdFilename="${MODULE_DIR}/BaseMemoryTest.mbd" msaFilename="${MODULE_DIR}/BaseMemoryTest.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiBaseMemoryTestInit_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiBaseMemoryTestInit_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiBaseMemoryTestInit_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiBaseMemoryTestInit_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiBaseMemoryTestInit_cleanall">

-      <OutputDirSetup baseName="PeiBaseMemoryTestInit" mbdFilename="${MODULE_DIR}\BaseMemoryTest.mbd" msaFilename="${MODULE_DIR}\BaseMemoryTest.msa"/>

+      <OutputDirSetup baseName="PeiBaseMemoryTestInit" mbdFilename="${MODULE_DIR}/BaseMemoryTest.mbd" msaFilename="${MODULE_DIR}/BaseMemoryTest.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiBaseMemoryTestInit_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiBaseMemoryTestInit_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiBaseMemoryTestInit_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiBaseMemoryTestInit_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/build.xml b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/build.xml
index ef6b8c4aa9..88115e453d 100644
--- a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\MonotonicCounter\RuntimeDxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/MonotonicCounter/RuntimeDxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="MonotonicCounter">

-      <GenBuild baseName="MonotonicCounter" mbdFilename="${MODULE_DIR}\MonotonicCounter.mbd" msaFilename="${MODULE_DIR}\MonotonicCounter.msa"/>

+      <GenBuild baseName="MonotonicCounter" mbdFilename="${MODULE_DIR}/MonotonicCounter.mbd" msaFilename="${MODULE_DIR}/MonotonicCounter.msa"/>

    </target>

    <target depends="MonotonicCounter_clean" name="clean"/>

    <target depends="MonotonicCounter_cleanall" name="cleanall"/>

    <target name="MonotonicCounter_clean">

-      <OutputDirSetup baseName="MonotonicCounter" mbdFilename="${MODULE_DIR}\MonotonicCounter.mbd" msaFilename="${MODULE_DIR}\MonotonicCounter.msa"/>

+      <OutputDirSetup baseName="MonotonicCounter" mbdFilename="${MODULE_DIR}/MonotonicCounter.mbd" msaFilename="${MODULE_DIR}/MonotonicCounter.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\MonotonicCounter_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/MonotonicCounter_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\MonotonicCounter_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/MonotonicCounter_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="MonotonicCounter_cleanall">

-      <OutputDirSetup baseName="MonotonicCounter" mbdFilename="${MODULE_DIR}\MonotonicCounter.mbd" msaFilename="${MODULE_DIR}\MonotonicCounter.msa"/>

+      <OutputDirSetup baseName="MonotonicCounter" mbdFilename="${MODULE_DIR}/MonotonicCounter.mbd" msaFilename="${MODULE_DIR}/MonotonicCounter.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\MonotonicCounter_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/MonotonicCounter_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\MonotonicCounter_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/MonotonicCounter_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/build.xml b/EdkModulePkg/Universal/Network/PxeBc/Dxe/build.xml
index 8ead9eabcc..e0b5ee64b0 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Network\PxeBc\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Network/PxeBc/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BC">

-      <GenBuild baseName="BC" mbdFilename="${MODULE_DIR}\BC.mbd" msaFilename="${MODULE_DIR}\BC.msa"/>

+      <GenBuild baseName="BC" mbdFilename="${MODULE_DIR}/BC.mbd" msaFilename="${MODULE_DIR}/BC.msa"/>

    </target>

    <target depends="BC_clean" name="clean"/>

    <target depends="BC_cleanall" name="cleanall"/>

    <target name="BC_clean">

-      <OutputDirSetup baseName="BC" mbdFilename="${MODULE_DIR}\BC.mbd" msaFilename="${MODULE_DIR}\BC.msa"/>

+      <OutputDirSetup baseName="BC" mbdFilename="${MODULE_DIR}/BC.mbd" msaFilename="${MODULE_DIR}/BC.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BC_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BC_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BC_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BC_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BC_cleanall">

-      <OutputDirSetup baseName="BC" mbdFilename="${MODULE_DIR}\BC.mbd" msaFilename="${MODULE_DIR}\BC.msa"/>

+      <OutputDirSetup baseName="BC" mbdFilename="${MODULE_DIR}/BC.mbd" msaFilename="${MODULE_DIR}/BC.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BC_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BC_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BC_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BC_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/build.xml b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/build.xml
index e7afd62b68..086aefce9a 100644
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Network\PxeDhcp4\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Network/PxeDhcp4/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Dhcp4">

-      <GenBuild baseName="Dhcp4" mbdFilename="${MODULE_DIR}\Dhcp4.mbd" msaFilename="${MODULE_DIR}\Dhcp4.msa"/>

+      <GenBuild baseName="Dhcp4" mbdFilename="${MODULE_DIR}/Dhcp4.mbd" msaFilename="${MODULE_DIR}/Dhcp4.msa"/>

    </target>

    <target depends="Dhcp4_clean" name="clean"/>

    <target depends="Dhcp4_cleanall" name="cleanall"/>

    <target name="Dhcp4_clean">

-      <OutputDirSetup baseName="Dhcp4" mbdFilename="${MODULE_DIR}\Dhcp4.mbd" msaFilename="${MODULE_DIR}\Dhcp4.msa"/>

+      <OutputDirSetup baseName="Dhcp4" mbdFilename="${MODULE_DIR}/Dhcp4.mbd" msaFilename="${MODULE_DIR}/Dhcp4.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Dhcp4_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Dhcp4_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Dhcp4_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Dhcp4_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Dhcp4_cleanall">

-      <OutputDirSetup baseName="Dhcp4" mbdFilename="${MODULE_DIR}\Dhcp4.mbd" msaFilename="${MODULE_DIR}\Dhcp4.msa"/>

+      <OutputDirSetup baseName="Dhcp4" mbdFilename="${MODULE_DIR}/Dhcp4.mbd" msaFilename="${MODULE_DIR}/Dhcp4.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Dhcp4_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Dhcp4_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Dhcp4_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Dhcp4_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/build.xml b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/build.xml
index 7387603fb3..74b81f4414 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Network\Snp32_64\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Network/Snp32_64/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="SNP">

-      <GenBuild baseName="SNP" mbdFilename="${MODULE_DIR}\SNP.mbd" msaFilename="${MODULE_DIR}\SNP.msa"/>

+      <GenBuild baseName="SNP" mbdFilename="${MODULE_DIR}/SNP.mbd" msaFilename="${MODULE_DIR}/SNP.msa"/>

    </target>

    <target depends="SNP_clean" name="clean"/>

    <target depends="SNP_cleanall" name="cleanall"/>

    <target name="SNP_clean">

-      <OutputDirSetup baseName="SNP" mbdFilename="${MODULE_DIR}\SNP.mbd" msaFilename="${MODULE_DIR}\SNP.msa"/>

+      <OutputDirSetup baseName="SNP" mbdFilename="${MODULE_DIR}/SNP.mbd" msaFilename="${MODULE_DIR}/SNP.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\SNP_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/SNP_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\SNP_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/SNP_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="SNP_cleanall">

-      <OutputDirSetup baseName="SNP" mbdFilename="${MODULE_DIR}\SNP.mbd" msaFilename="${MODULE_DIR}\SNP.msa"/>

+      <OutputDirSetup baseName="SNP" mbdFilename="${MODULE_DIR}/SNP.mbd" msaFilename="${MODULE_DIR}/SNP.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\SNP_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/SNP_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\SNP_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/SNP_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
index 8b918ab205..5d9a92f854 100644
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
+++ b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
@@ -49,15 +49,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>Runtime.h</Filename>

     <Filename>Crc32.c</Filename>

     <Arch ArchType="IA32">

-      <Filename>Ia32\PeHotRelocateEx.c</Filename>

+      <Filename>Ia32/PeHotRelocateEx.c</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>x64\PeHotRelocateEx.c</Filename>

-      <Filename>x64\PeHotRelocateEx.h</Filename>

+      <Filename>x64/PeHotRelocateEx.c</Filename>

+      <Filename>x64/PeHotRelocateEx.h</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\PeHotRelocateEx.c</Filename>

-      <Filename>Ipf\PeHotRelocateEx.h</Filename>

+      <Filename>Ipf/PeHotRelocateEx.c</Filename>

+      <Filename>Ipf/PeHotRelocateEx.h</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/build.xml b/EdkModulePkg/Universal/Runtime/RuntimeDxe/build.xml
index d11bd8deb4..48f5fe7205 100644
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Universal/Runtime/RuntimeDxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Runtime\RuntimeDxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Runtime/RuntimeDxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Runtime">

-      <GenBuild baseName="Runtime" mbdFilename="${MODULE_DIR}\Runtime.mbd" msaFilename="${MODULE_DIR}\Runtime.msa"/>

+      <GenBuild baseName="Runtime" mbdFilename="${MODULE_DIR}/Runtime.mbd" msaFilename="${MODULE_DIR}/Runtime.msa"/>

    </target>

    <target depends="Runtime_clean" name="clean"/>

    <target depends="Runtime_cleanall" name="cleanall"/>

    <target name="Runtime_clean">

-      <OutputDirSetup baseName="Runtime" mbdFilename="${MODULE_DIR}\Runtime.mbd" msaFilename="${MODULE_DIR}\Runtime.msa"/>

+      <OutputDirSetup baseName="Runtime" mbdFilename="${MODULE_DIR}/Runtime.mbd" msaFilename="${MODULE_DIR}/Runtime.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Runtime_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Runtime_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Runtime_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Runtime_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Runtime_cleanall">

-      <OutputDirSetup baseName="Runtime" mbdFilename="${MODULE_DIR}\Runtime.mbd" msaFilename="${MODULE_DIR}\Runtime.msa"/>

+      <OutputDirSetup baseName="Runtime" mbdFilename="${MODULE_DIR}/Runtime.mbd" msaFilename="${MODULE_DIR}/Runtime.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Runtime_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Runtime_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Runtime_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Runtime_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/build.xml b/EdkModulePkg/Universal/Security/SecurityStub/Dxe/build.xml
index 991db08208..62347a3ba5 100644
--- a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Security/SecurityStub/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Security\SecurityStub\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Security/SecurityStub/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="SecurityStub">

-      <GenBuild baseName="SecurityStub" mbdFilename="${MODULE_DIR}\SecurityStub.mbd" msaFilename="${MODULE_DIR}\SecurityStub.msa"/>

+      <GenBuild baseName="SecurityStub" mbdFilename="${MODULE_DIR}/SecurityStub.mbd" msaFilename="${MODULE_DIR}/SecurityStub.msa"/>

    </target>

    <target depends="SecurityStub_clean" name="clean"/>

    <target depends="SecurityStub_cleanall" name="cleanall"/>

    <target name="SecurityStub_clean">

-      <OutputDirSetup baseName="SecurityStub" mbdFilename="${MODULE_DIR}\SecurityStub.mbd" msaFilename="${MODULE_DIR}\SecurityStub.msa"/>

+      <OutputDirSetup baseName="SecurityStub" mbdFilename="${MODULE_DIR}/SecurityStub.mbd" msaFilename="${MODULE_DIR}/SecurityStub.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\SecurityStub_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/SecurityStub_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\SecurityStub_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/SecurityStub_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="SecurityStub_cleanall">

-      <OutputDirSetup baseName="SecurityStub" mbdFilename="${MODULE_DIR}\SecurityStub.mbd" msaFilename="${MODULE_DIR}\SecurityStub.msa"/>

+      <OutputDirSetup baseName="SecurityStub" mbdFilename="${MODULE_DIR}/SecurityStub.mbd" msaFilename="${MODULE_DIR}/SecurityStub.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\SecurityStub_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/SecurityStub_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\SecurityStub_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/SecurityStub_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.msa b/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.msa
index b0d888b963..79d8695d25 100644
--- a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.msa
+++ b/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.msa
@@ -49,16 +49,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>StatusCode.c</Filename>

     <Filename>StatusCode.h</Filename>

     <Arch ArchType="IA32">

-      <Filename>Ia32\Ia32StatusCode.c</Filename>

-      <Filename>Ia32\Ia32StatusCode.dxs</Filename>

+      <Filename>Ia32/Ia32StatusCode.c</Filename>

+      <Filename>Ia32/Ia32StatusCode.dxs</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>x64\x64StatusCode.c</Filename>

-      <Filename>x64\x64StatusCode.dxs</Filename>

+      <Filename>x64/x64StatusCode.c</Filename>

+      <Filename>x64/x64StatusCode.dxs</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\IpfStatusCode.c</Filename>

-      <Filename>Ipf\IpfStatusCode.dxs</Filename>

+      <Filename>Ipf/IpfStatusCode.c</Filename>

+      <Filename>Ipf/IpfStatusCode.dxs</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/build.xml b/EdkModulePkg/Universal/StatusCode/RuntimeDxe/build.xml
index 994d073598..73760684aa 100644
--- a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Universal/StatusCode/RuntimeDxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\StatusCode\RuntimeDxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/StatusCode/RuntimeDxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="StatusCode">

-      <GenBuild baseName="StatusCode" mbdFilename="${MODULE_DIR}\StatusCode.mbd" msaFilename="${MODULE_DIR}\StatusCode.msa"/>

+      <GenBuild baseName="StatusCode" mbdFilename="${MODULE_DIR}/StatusCode.mbd" msaFilename="${MODULE_DIR}/StatusCode.msa"/>

    </target>

    <target depends="StatusCode_clean" name="clean"/>

    <target depends="StatusCode_cleanall" name="cleanall"/>

    <target name="StatusCode_clean">

-      <OutputDirSetup baseName="StatusCode" mbdFilename="${MODULE_DIR}\StatusCode.mbd" msaFilename="${MODULE_DIR}\StatusCode.msa"/>

+      <OutputDirSetup baseName="StatusCode" mbdFilename="${MODULE_DIR}/StatusCode.mbd" msaFilename="${MODULE_DIR}/StatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\StatusCode_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/StatusCode_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\StatusCode_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/StatusCode_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="StatusCode_cleanall">

-      <OutputDirSetup baseName="StatusCode" mbdFilename="${MODULE_DIR}\StatusCode.mbd" msaFilename="${MODULE_DIR}\StatusCode.msa"/>

+      <OutputDirSetup baseName="StatusCode" mbdFilename="${MODULE_DIR}/StatusCode.mbd" msaFilename="${MODULE_DIR}/StatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\StatusCode_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/StatusCode_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\StatusCode_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/StatusCode_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/build.xml b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/build.xml
index 7ffdb7c013..f39f754091 100644
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/build.xml
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\UserInterface\HiiDataBase\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/UserInterface/HiiDataBase/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="HiiDatabase">

-      <GenBuild baseName="HiiDatabase" mbdFilename="${MODULE_DIR}\HiiDatabase.mbd" msaFilename="${MODULE_DIR}\HiiDatabase.msa"/>

+      <GenBuild baseName="HiiDatabase" mbdFilename="${MODULE_DIR}/HiiDatabase.mbd" msaFilename="${MODULE_DIR}/HiiDatabase.msa"/>

    </target>

    <target depends="HiiDatabase_clean" name="clean"/>

    <target depends="HiiDatabase_cleanall" name="cleanall"/>

    <target name="HiiDatabase_clean">

-      <OutputDirSetup baseName="HiiDatabase" mbdFilename="${MODULE_DIR}\HiiDatabase.mbd" msaFilename="${MODULE_DIR}\HiiDatabase.msa"/>

+      <OutputDirSetup baseName="HiiDatabase" mbdFilename="${MODULE_DIR}/HiiDatabase.mbd" msaFilename="${MODULE_DIR}/HiiDatabase.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\HiiDatabase_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/HiiDatabase_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\HiiDatabase_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/HiiDatabase_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="HiiDatabase_cleanall">

-      <OutputDirSetup baseName="HiiDatabase" mbdFilename="${MODULE_DIR}\HiiDatabase.mbd" msaFilename="${MODULE_DIR}\HiiDatabase.msa"/>

+      <OutputDirSetup baseName="HiiDatabase" mbdFilename="${MODULE_DIR}/HiiDatabase.mbd" msaFilename="${MODULE_DIR}/HiiDatabase.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\HiiDatabase_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/HiiDatabase_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\HiiDatabase_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/HiiDatabase_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/build.xml b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/build.xml
index 1263279552..5cc8859f7b 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/build.xml
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\UserInterface\SetupBrowser\Dxe\DriverSample"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/UserInterface/SetupBrowser/Dxe/DriverSample"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DriverSample">

-      <GenBuild baseName="DriverSample" mbdFilename="${MODULE_DIR}\DriverSample.mbd" msaFilename="${MODULE_DIR}\DriverSample.msa"/>

+      <GenBuild baseName="DriverSample" mbdFilename="${MODULE_DIR}/DriverSample.mbd" msaFilename="${MODULE_DIR}/DriverSample.msa"/>

    </target>

    <target depends="DriverSample_clean" name="clean"/>

    <target depends="DriverSample_cleanall" name="cleanall"/>

    <target name="DriverSample_clean">

-      <OutputDirSetup baseName="DriverSample" mbdFilename="${MODULE_DIR}\DriverSample.mbd" msaFilename="${MODULE_DIR}\DriverSample.msa"/>

+      <OutputDirSetup baseName="DriverSample" mbdFilename="${MODULE_DIR}/DriverSample.mbd" msaFilename="${MODULE_DIR}/DriverSample.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DriverSample_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DriverSample_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DriverSample_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DriverSample_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DriverSample_cleanall">

-      <OutputDirSetup baseName="DriverSample" mbdFilename="${MODULE_DIR}\DriverSample.mbd" msaFilename="${MODULE_DIR}\DriverSample.msa"/>

+      <OutputDirSetup baseName="DriverSample" mbdFilename="${MODULE_DIR}/DriverSample.mbd" msaFilename="${MODULE_DIR}/DriverSample.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DriverSample_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DriverSample_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DriverSample_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DriverSample_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/build.xml b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/build.xml
index a94cdfa58c..8e3b5c5cec 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/build.xml
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\UserInterface\SetupBrowser\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/UserInterface/SetupBrowser/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="SetupBrowser">

-      <GenBuild baseName="SetupBrowser" mbdFilename="${MODULE_DIR}\SetupBrowser.mbd" msaFilename="${MODULE_DIR}\SetupBrowser.msa"/>

+      <GenBuild baseName="SetupBrowser" mbdFilename="${MODULE_DIR}/SetupBrowser.mbd" msaFilename="${MODULE_DIR}/SetupBrowser.msa"/>

    </target>

    <target depends="SetupBrowser_clean" name="clean"/>

    <target depends="SetupBrowser_cleanall" name="cleanall"/>

    <target name="SetupBrowser_clean">

-      <OutputDirSetup baseName="SetupBrowser" mbdFilename="${MODULE_DIR}\SetupBrowser.mbd" msaFilename="${MODULE_DIR}\SetupBrowser.msa"/>

+      <OutputDirSetup baseName="SetupBrowser" mbdFilename="${MODULE_DIR}/SetupBrowser.mbd" msaFilename="${MODULE_DIR}/SetupBrowser.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\SetupBrowser_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/SetupBrowser_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\SetupBrowser_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/SetupBrowser_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="SetupBrowser_cleanall">

-      <OutputDirSetup baseName="SetupBrowser" mbdFilename="${MODULE_DIR}\SetupBrowser.mbd" msaFilename="${MODULE_DIR}\SetupBrowser.msa"/>

+      <OutputDirSetup baseName="SetupBrowser" mbdFilename="${MODULE_DIR}/SetupBrowser.mbd" msaFilename="${MODULE_DIR}/SetupBrowser.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\SetupBrowser_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/SetupBrowser_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\SetupBrowser_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/SetupBrowser_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Variable/Pei/build.xml b/EdkModulePkg/Universal/Variable/Pei/build.xml
index c6b57f9f77..95255e7613 100644
--- a/EdkModulePkg/Universal/Variable/Pei/build.xml
+++ b/EdkModulePkg/Universal/Variable/Pei/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Variable\Pei"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Variable/Pei"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiVariable">

-      <GenBuild baseName="PeiVariable" mbdFilename="${MODULE_DIR}\Variable.mbd" msaFilename="${MODULE_DIR}\Variable.msa"/>

+      <GenBuild baseName="PeiVariable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>

    </target>

    <target depends="PeiVariable_clean" name="clean"/>

    <target depends="PeiVariable_cleanall" name="cleanall"/>

    <target name="PeiVariable_clean">

-      <OutputDirSetup baseName="PeiVariable" mbdFilename="${MODULE_DIR}\Variable.mbd" msaFilename="${MODULE_DIR}\Variable.msa"/>

+      <OutputDirSetup baseName="PeiVariable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiVariable_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiVariable_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiVariable_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiVariable_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiVariable_cleanall">

-      <OutputDirSetup baseName="PeiVariable" mbdFilename="${MODULE_DIR}\Variable.mbd" msaFilename="${MODULE_DIR}\Variable.msa"/>

+      <OutputDirSetup baseName="PeiVariable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiVariable_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiVariable_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiVariable_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiVariable_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.msa
index 5a7a5f8447..6ecc152b59 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.msa
@@ -44,13 +44,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>EmuVariable.c</Filename>

     <Filename>EmuVariable.dxs</Filename>

     <Arch ArchType="IA32">

-      <Filename>..\Ia32\Ia32Variable.c</Filename>

+      <Filename>../Ia32/Ia32Variable.c</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>..\x64\x64Variable.c</Filename>

+      <Filename>../x64/x64Variable.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>..\Ipf\IpfVariable.c</Filename>

+      <Filename>../Ipf/IpfVariable.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/build.xml b/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/build.xml
index 0035ab957b..11ad9af405 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/build.xml
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Variable\RuntimeDxe\Emu"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Variable/RuntimeDxe/Emu"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="EmuVariable">

-      <GenBuild baseName="EmuVariable" mbdFilename="${MODULE_DIR}\EmuVariable.mbd" msaFilename="${MODULE_DIR}\EmuVariable.msa"/>

+      <GenBuild baseName="EmuVariable" mbdFilename="${MODULE_DIR}/EmuVariable.mbd" msaFilename="${MODULE_DIR}/EmuVariable.msa"/>

    </target>

    <target depends="EmuVariable_clean" name="clean"/>

    <target depends="EmuVariable_cleanall" name="cleanall"/>

    <target name="EmuVariable_clean">

-      <OutputDirSetup baseName="EmuVariable" mbdFilename="${MODULE_DIR}\EmuVariable.mbd" msaFilename="${MODULE_DIR}\EmuVariable.msa"/>

+      <OutputDirSetup baseName="EmuVariable" mbdFilename="${MODULE_DIR}/EmuVariable.mbd" msaFilename="${MODULE_DIR}/EmuVariable.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EmuVariable_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EmuVariable_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EmuVariable_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EmuVariable_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="EmuVariable_cleanall">

-      <OutputDirSetup baseName="EmuVariable" mbdFilename="${MODULE_DIR}\EmuVariable.mbd" msaFilename="${MODULE_DIR}\EmuVariable.msa"/>

+      <OutputDirSetup baseName="EmuVariable" mbdFilename="${MODULE_DIR}/EmuVariable.mbd" msaFilename="${MODULE_DIR}/EmuVariable.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\EmuVariable_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/EmuVariable_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\EmuVariable_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/EmuVariable_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index a4399bc0d2..a750f2e033 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
@@ -60,7 +60,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Filename>x64Variable.dxs</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\InitVariable.c</Filename>

+      <Filename>Ipf/InitVariable.c</Filename>

       <Filename>IpfVariable.dxs</Filename>

     </Arch>

   </SourceFiles>

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/build.xml b/EdkModulePkg/Universal/Variable/RuntimeDxe/build.xml
index 4eba6a6933..5e948e35f0 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\Variable\RuntimeDxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/Variable/RuntimeDxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Variable">

-      <GenBuild baseName="Variable" mbdFilename="${MODULE_DIR}\Variable.mbd" msaFilename="${MODULE_DIR}\Variable.msa"/>

+      <GenBuild baseName="Variable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>

    </target>

    <target depends="Variable_clean" name="clean"/>

    <target depends="Variable_cleanall" name="cleanall"/>

    <target name="Variable_clean">

-      <OutputDirSetup baseName="Variable" mbdFilename="${MODULE_DIR}\Variable.mbd" msaFilename="${MODULE_DIR}\Variable.msa"/>

+      <OutputDirSetup baseName="Variable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Variable_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Variable_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Variable_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Variable_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Variable_cleanall">

-      <OutputDirSetup baseName="Variable" mbdFilename="${MODULE_DIR}\Variable.mbd" msaFilename="${MODULE_DIR}\Variable.msa"/>

+      <OutputDirSetup baseName="Variable" mbdFilename="${MODULE_DIR}/Variable.mbd" msaFilename="${MODULE_DIR}/Variable.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Variable_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Variable_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Variable_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Variable_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Universal/WatchdogTimer/Dxe/build.xml b/EdkModulePkg/Universal/WatchdogTimer/Dxe/build.xml
index 76f67c162e..976ba17b84 100644
--- a/EdkModulePkg/Universal/WatchdogTimer/Dxe/build.xml
+++ b/EdkModulePkg/Universal/WatchdogTimer/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Universal\WatchdogTimer\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Universal/WatchdogTimer/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="WatchDogTimer">

-      <GenBuild baseName="WatchDogTimer" mbdFilename="${MODULE_DIR}\WatchDogTimer.mbd" msaFilename="${MODULE_DIR}\WatchDogTimer.msa"/>

+      <GenBuild baseName="WatchDogTimer" mbdFilename="${MODULE_DIR}/WatchDogTimer.mbd" msaFilename="${MODULE_DIR}/WatchDogTimer.msa"/>

    </target>

    <target depends="WatchDogTimer_clean" name="clean"/>

    <target depends="WatchDogTimer_cleanall" name="cleanall"/>

    <target name="WatchDogTimer_clean">

-      <OutputDirSetup baseName="WatchDogTimer" mbdFilename="${MODULE_DIR}\WatchDogTimer.mbd" msaFilename="${MODULE_DIR}\WatchDogTimer.msa"/>

+      <OutputDirSetup baseName="WatchDogTimer" mbdFilename="${MODULE_DIR}/WatchDogTimer.mbd" msaFilename="${MODULE_DIR}/WatchDogTimer.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\WatchDogTimer_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/WatchDogTimer_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\WatchDogTimer_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/WatchDogTimer_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="WatchDogTimer_cleanall">

-      <OutputDirSetup baseName="WatchDogTimer" mbdFilename="${MODULE_DIR}\WatchDogTimer.mbd" msaFilename="${MODULE_DIR}\WatchDogTimer.msa"/>

+      <OutputDirSetup baseName="WatchDogTimer" mbdFilename="${MODULE_DIR}/WatchDogTimer.mbd" msaFilename="${MODULE_DIR}/WatchDogTimer.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\WatchDogTimer_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/WatchDogTimer_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\WatchDogTimer_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/WatchDogTimer_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/build.xml b/EdkModulePkg/build.xml
index 41712df4e8..a5df7f3046 100644
--- a/EdkModulePkg/build.xml
+++ b/EdkModulePkg/build.xml
@@ -18,10 +18,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property environment="env" />  

   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}" />

   <property name="PACKAGE" value="EdkModulePkg" />

-  <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\EdkModulePkg" />

+  <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}/EdkModulePkg" />

   <property name="BUILD_MODE" value="PACKAGE" />

   

-  <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml" />

+  <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml" />

   

   <target name="buildfpd" depends="init, fpdparser, builds" />

   

@@ -34,11 +34,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <fail message="WORKSPACE environmental variable not set." />

       </then>

     </if>

-    <ToolChainSetup confPath="${WORKSPACE_DIR}\Tools\Conf" />

+    <ToolChainSetup confPath="${WORKSPACE_DIR}/Tools/Conf" />

   </target>

 

   <target name="tools">

-    <ant antfile="${WORKSPACE_DIR}\Tools\Source\TianoTools\build.xml" />

+    <ant antfile="${WORKSPACE_DIR}/Tools/Source/TianoTools/build.xml" />

   </target>

   

   <target name="fpdparser" unless="FPD_File">

@@ -46,15 +46,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>

   

   <target name="builds" depends="fpdparser">

-    <ant antfile="${PACKAGE_DIR}\build.out.xml" />

+    <ant antfile="${PACKAGE_DIR}/build.out.xml" />

   </target>

   

   <!-- clean. -->

   <target name="clean" depends="init">

     <if>

-      <available file="${PACKAGE_DIR}\build.out.xml" />

+      <available file="${PACKAGE_DIR}/build.out.xml" />

       <then>

-        <ant antfile="${PACKAGE_DIR}\build.out.xml" target="clean" />

+        <ant antfile="${PACKAGE_DIR}/build.out.xml" target="clean" />

       </then>

     </if>

   </target>

@@ -62,13 +62,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!-- clean All. -->

   <target name="cleanall" depends="init">

     <if>

-      <available file="${PACKAGE_DIR}\build.out.xml" />

+      <available file="${PACKAGE_DIR}/build.out.xml" />

       <then>

-        <ant antfile="${PACKAGE_DIR}\build.out.xml" target="cleanall" />

-        <delete file="${PACKAGE_DIR}\build.out.xml" />

+        <ant antfile="${PACKAGE_DIR}/build.out.xml" target="cleanall" />

+        <delete file="${PACKAGE_DIR}/build.out.xml" />

       </then>

     </if>

-    <delete dir="${PACKAGE_DIR}\Build\FV" />

+    <delete dir="${PACKAGE_DIR}/Build/FV" />

   </target>

   

 </project>

diff --git a/EdkShellBinPkg/bin/build.xml b/EdkShellBinPkg/bin/build.xml
index 807380107d..fed916a127 100644
--- a/EdkShellBinPkg/bin/build.xml
+++ b/EdkShellBinPkg/bin/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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-->

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

    <property name="MODULE_RELATIVE_PATH" value="bin"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Shell">

-      <GenBuild baseName="Shell" mbdFilename="${MODULE_DIR}\Shell.mbd" msaFilename="${MODULE_DIR}\Shell.msa"/>

+      <GenBuild baseName="Shell" mbdFilename="${MODULE_DIR}/Shell.mbd" msaFilename="${MODULE_DIR}/Shell.msa"/>

    </target>

    <target depends="Shell_clean" name="clean"/>

    <target depends="Shell_cleanall" name="cleanall"/>

    <target name="Shell_clean">

-      <OutputDirSetup baseName="Shell" mbdFilename="${MODULE_DIR}\Shell.mbd" msaFilename="${MODULE_DIR}\Shell.msa"/>

+      <OutputDirSetup baseName="Shell" mbdFilename="${MODULE_DIR}/Shell.mbd" msaFilename="${MODULE_DIR}/Shell.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Shell_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Shell_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Shell_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Shell_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Shell_cleanall">

-      <OutputDirSetup baseName="Shell" mbdFilename="${MODULE_DIR}\Shell.mbd" msaFilename="${MODULE_DIR}\Shell.msa"/>

+      <OutputDirSetup baseName="Shell" mbdFilename="${MODULE_DIR}/Shell.mbd" msaFilename="${MODULE_DIR}/Shell.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Shell_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Shell_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Shell_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Shell_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/build.xml b/MdePkg/Library/BaseCacheMaintenanceLib/build.xml
index 0df03c4356..990fd68f40 100644
--- a/MdePkg/Library/BaseCacheMaintenanceLib/build.xml
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseCacheMaintenanceLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseCacheMaintenanceLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseCacheMaintenanceLib">

-      <GenBuild baseName="BaseCacheMaintenanceLib" mbdFilename="${MODULE_DIR}\BaseCacheMaintenanceLib.mbd" msaFilename="${MODULE_DIR}\BaseCacheMaintenanceLib.msa"/>

+      <GenBuild baseName="BaseCacheMaintenanceLib" mbdFilename="${MODULE_DIR}/BaseCacheMaintenanceLib.mbd" msaFilename="${MODULE_DIR}/BaseCacheMaintenanceLib.msa"/>

    </target>

    <target depends="BaseCacheMaintenanceLib_clean" name="clean"/>

    <target depends="BaseCacheMaintenanceLib_cleanall" name="cleanall"/>

    <target name="BaseCacheMaintenanceLib_clean">

-      <OutputDirSetup baseName="BaseCacheMaintenanceLib" mbdFilename="${MODULE_DIR}\BaseCacheMaintenanceLib.mbd" msaFilename="${MODULE_DIR}\BaseCacheMaintenanceLib.msa"/>

+      <OutputDirSetup baseName="BaseCacheMaintenanceLib" mbdFilename="${MODULE_DIR}/BaseCacheMaintenanceLib.mbd" msaFilename="${MODULE_DIR}/BaseCacheMaintenanceLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseCacheMaintenanceLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseCacheMaintenanceLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseCacheMaintenanceLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseCacheMaintenanceLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseCacheMaintenanceLib_cleanall">

-      <OutputDirSetup baseName="BaseCacheMaintenanceLib" mbdFilename="${MODULE_DIR}\BaseCacheMaintenanceLib.mbd" msaFilename="${MODULE_DIR}\BaseCacheMaintenanceLib.msa"/>

+      <OutputDirSetup baseName="BaseCacheMaintenanceLib" mbdFilename="${MODULE_DIR}/BaseCacheMaintenanceLib.mbd" msaFilename="${MODULE_DIR}/BaseCacheMaintenanceLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseCacheMaintenanceLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseCacheMaintenanceLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseCacheMaintenanceLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseCacheMaintenanceLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseDebugLibNull/build.xml b/MdePkg/Library/BaseDebugLibNull/build.xml
index fec569082a..72c80ab8d8 100644
--- a/MdePkg/Library/BaseDebugLibNull/build.xml
+++ b/MdePkg/Library/BaseDebugLibNull/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseDebugLibNull"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseDebugLibNull"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseDebugLibNull">

-      <GenBuild baseName="BaseDebugLibNull" mbdFilename="${MODULE_DIR}\BaseDebugLibNull.mbd" msaFilename="${MODULE_DIR}\BaseDebugLibNull.msa"/>

+      <GenBuild baseName="BaseDebugLibNull" mbdFilename="${MODULE_DIR}/BaseDebugLibNull.mbd" msaFilename="${MODULE_DIR}/BaseDebugLibNull.msa"/>

    </target>

    <target depends="BaseDebugLibNull_clean" name="clean"/>

    <target depends="BaseDebugLibNull_cleanall" name="cleanall"/>

    <target name="BaseDebugLibNull_clean">

-      <OutputDirSetup baseName="BaseDebugLibNull" mbdFilename="${MODULE_DIR}\BaseDebugLibNull.mbd" msaFilename="${MODULE_DIR}\BaseDebugLibNull.msa"/>

+      <OutputDirSetup baseName="BaseDebugLibNull" mbdFilename="${MODULE_DIR}/BaseDebugLibNull.mbd" msaFilename="${MODULE_DIR}/BaseDebugLibNull.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseDebugLibNull_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseDebugLibNull_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseDebugLibNull_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseDebugLibNull_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseDebugLibNull_cleanall">

-      <OutputDirSetup baseName="BaseDebugLibNull" mbdFilename="${MODULE_DIR}\BaseDebugLibNull.mbd" msaFilename="${MODULE_DIR}\BaseDebugLibNull.msa"/>

+      <OutputDirSetup baseName="BaseDebugLibNull" mbdFilename="${MODULE_DIR}/BaseDebugLibNull.mbd" msaFilename="${MODULE_DIR}/BaseDebugLibNull.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseDebugLibNull_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseDebugLibNull_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseDebugLibNull_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseDebugLibNull_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseDebugLibReportStatusCode/build.xml b/MdePkg/Library/BaseDebugLibReportStatusCode/build.xml
index edfc5fcd8d..cd85f3567c 100644
--- a/MdePkg/Library/BaseDebugLibReportStatusCode/build.xml
+++ b/MdePkg/Library/BaseDebugLibReportStatusCode/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseDebugLibReportStatusCode"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseDebugLibReportStatusCode"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseDebugLibReportStatusCode">

-      <GenBuild baseName="BaseDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}\BaseDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}\BaseDebugLibReportStatusCode.msa"/>

+      <GenBuild baseName="BaseDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}/BaseDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}/BaseDebugLibReportStatusCode.msa"/>

    </target>

    <target depends="BaseDebugLibReportStatusCode_clean" name="clean"/>

    <target depends="BaseDebugLibReportStatusCode_cleanall" name="cleanall"/>

    <target name="BaseDebugLibReportStatusCode_clean">

-      <OutputDirSetup baseName="BaseDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}\BaseDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}\BaseDebugLibReportStatusCode.msa"/>

+      <OutputDirSetup baseName="BaseDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}/BaseDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}/BaseDebugLibReportStatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseDebugLibReportStatusCode_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseDebugLibReportStatusCode_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseDebugLibReportStatusCode_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseDebugLibReportStatusCode_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseDebugLibReportStatusCode_cleanall">

-      <OutputDirSetup baseName="BaseDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}\BaseDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}\BaseDebugLibReportStatusCode.msa"/>

+      <OutputDirSetup baseName="BaseDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}/BaseDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}/BaseDebugLibReportStatusCode.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseDebugLibReportStatusCode_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseDebugLibReportStatusCode_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseDebugLibReportStatusCode_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseDebugLibReportStatusCode_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/build.xml b/MdePkg/Library/BaseIoLibIntrinsic/build.xml
index 9ef6c0ccb7..9e5a3b3837 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/build.xml
+++ b/MdePkg/Library/BaseIoLibIntrinsic/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseIoLibIntrinsic"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseIoLibIntrinsic"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseIoLibIntrinsic">

-      <GenBuild baseName="BaseIoLibIntrinsic" mbdFilename="${MODULE_DIR}\BaseIoLibIntrinsic.mbd" msaFilename="${MODULE_DIR}\BaseIoLibIntrinsic.msa"/>

+      <GenBuild baseName="BaseIoLibIntrinsic" mbdFilename="${MODULE_DIR}/BaseIoLibIntrinsic.mbd" msaFilename="${MODULE_DIR}/BaseIoLibIntrinsic.msa"/>

    </target>

    <target depends="BaseIoLibIntrinsic_clean" name="clean"/>

    <target depends="BaseIoLibIntrinsic_cleanall" name="cleanall"/>

    <target name="BaseIoLibIntrinsic_clean">

-      <OutputDirSetup baseName="BaseIoLibIntrinsic" mbdFilename="${MODULE_DIR}\BaseIoLibIntrinsic.mbd" msaFilename="${MODULE_DIR}\BaseIoLibIntrinsic.msa"/>

+      <OutputDirSetup baseName="BaseIoLibIntrinsic" mbdFilename="${MODULE_DIR}/BaseIoLibIntrinsic.mbd" msaFilename="${MODULE_DIR}/BaseIoLibIntrinsic.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseIoLibIntrinsic_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseIoLibIntrinsic_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseIoLibIntrinsic_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseIoLibIntrinsic_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseIoLibIntrinsic_cleanall">

-      <OutputDirSetup baseName="BaseIoLibIntrinsic" mbdFilename="${MODULE_DIR}\BaseIoLibIntrinsic.mbd" msaFilename="${MODULE_DIR}\BaseIoLibIntrinsic.msa"/>

+      <OutputDirSetup baseName="BaseIoLibIntrinsic" mbdFilename="${MODULE_DIR}/BaseIoLibIntrinsic.mbd" msaFilename="${MODULE_DIR}/BaseIoLibIntrinsic.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseIoLibIntrinsic_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseIoLibIntrinsic_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseIoLibIntrinsic_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseIoLibIntrinsic_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseLib/BaseLib.msa b/MdePkg/Library/BaseLib/BaseLib.msa
index efc9eadda7..a64eea5071 100644
--- a/MdePkg/Library/BaseLib/BaseLib.msa
+++ b/MdePkg/Library/BaseLib/BaseLib.msa
@@ -72,213 +72,213 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Filename>x86LowLevel.c</Filename>

       <Filename>x86Thunk.c</Filename>

       <Filename>Unaligned.c</Filename>

-      <Filename>Ia32\Non-existing.c</Filename>

-      <Filename>Ia32\LShiftU64.asm</Filename>

-      <Filename>Ia32\RShiftU64.asm</Filename>

-      <Filename>Ia32\ARShiftU64.asm</Filename>

-      <Filename>Ia32\LRotU64.asm</Filename>

-      <Filename>Ia32\RRotU64.asm</Filename>

-      <Filename>Ia32\MultU64x32.asm</Filename>

-      <Filename>Ia32\MultU64x64.asm</Filename>

-      <Filename>Ia32\DivU64x32.asm</Filename>

-      <Filename>Ia32\ModU64x32.asm</Filename>

-      <Filename>Ia32\DivU64x32Remainder.asm</Filename>

-      <Filename>Ia32\DivU64x64Remainder.asm</Filename>

-      <Filename>Ia32\DivS64x64Remainder.c</Filename>

-      <Filename>Ia32\SwapBytes64.asm</Filename>

-      <Filename>Ia32\SetJump.asm</Filename>

-      <Filename>Ia32\LongJump.asm</Filename>

-      <Filename>Ia32\SwitchStack.c</Filename>

-      <Filename>Ia32\CpuId.asm</Filename>

-      <Filename>Ia32\ReadEflags.asm</Filename>

-      <Filename>Ia32\ReadMsr64.asm</Filename>

-      <Filename>Ia32\WriteMsr32.asm</Filename>

-      <Filename>Ia32\WriteMsr64.asm</Filename>

-      <Filename>Ia32\ReadCr0.asm</Filename>

-      <Filename>Ia32\ReadCr2.asm</Filename>

-      <Filename>Ia32\ReadCr3.asm</Filename>

-      <Filename>Ia32\ReadCr4.asm</Filename>

-      <Filename>Ia32\WriteCr0.asm</Filename>

-      <Filename>Ia32\WriteCr2.asm</Filename>

-      <Filename>Ia32\WriteCr3.asm</Filename>

-      <Filename>Ia32\WriteCr4.asm</Filename>

-      <Filename>Ia32\ReadDr0.asm</Filename>

-      <Filename>Ia32\ReadDr1.asm</Filename>

-      <Filename>Ia32\ReadDr2.asm</Filename>

-      <Filename>Ia32\ReadDr3.asm</Filename>

-      <Filename>Ia32\ReadDr4.asm</Filename>

-      <Filename>Ia32\ReadDr5.asm</Filename>

-      <Filename>Ia32\ReadDr6.asm</Filename>

-      <Filename>Ia32\ReadDr7.asm</Filename>

-      <Filename>Ia32\WriteDr0.asm</Filename>

-      <Filename>Ia32\WriteDr1.asm</Filename>

-      <Filename>Ia32\WriteDr2.asm</Filename>

-      <Filename>Ia32\WriteDr3.asm</Filename>

-      <Filename>Ia32\WriteDr4.asm</Filename>

-      <Filename>Ia32\WriteDr5.asm</Filename>

-      <Filename>Ia32\WriteDr6.asm</Filename>

-      <Filename>Ia32\WriteDr7.asm</Filename>

-      <Filename>Ia32\ReadCs.asm</Filename>

-      <Filename>Ia32\ReadDs.asm</Filename>

-      <Filename>Ia32\ReadEs.asm</Filename>

-      <Filename>Ia32\ReadFs.asm</Filename>

-      <Filename>Ia32\ReadGs.asm</Filename>

-      <Filename>Ia32\ReadSs.asm</Filename>

-      <Filename>Ia32\ReadTr.asm</Filename>

-      <Filename>Ia32\ReadGdtr.asm</Filename>

-      <Filename>Ia32\WriteGdtr.asm</Filename>

-      <Filename>Ia32\ReadIdtr.asm</Filename>

-      <Filename>Ia32\WriteIdtr.asm</Filename>

-      <Filename>Ia32\ReadLdtr.asm</Filename>

-      <Filename>Ia32\WriteLdtr.asm</Filename>

-      <Filename>Ia32\FxSave.asm</Filename>

-      <Filename>Ia32\FxRestore.asm</Filename>

-      <Filename>Ia32\ReadMm0.asm</Filename>

-      <Filename>Ia32\ReadMm1.asm</Filename>

-      <Filename>Ia32\ReadMm2.asm</Filename>

-      <Filename>Ia32\ReadMm3.asm</Filename>

-      <Filename>Ia32\ReadMm4.asm</Filename>

-      <Filename>Ia32\ReadMm5.asm</Filename>

-      <Filename>Ia32\ReadMm6.asm</Filename>

-      <Filename>Ia32\ReadMm7.asm</Filename>

-      <Filename>Ia32\WriteMm0.asm</Filename>

-      <Filename>Ia32\WriteMm1.asm</Filename>

-      <Filename>Ia32\WriteMm2.asm</Filename>

-      <Filename>Ia32\WriteMm3.asm</Filename>

-      <Filename>Ia32\WriteMm4.asm</Filename>

-      <Filename>Ia32\WriteMm5.asm</Filename>

-      <Filename>Ia32\WriteMm6.asm</Filename>

-      <Filename>Ia32\WriteMm7.asm</Filename>

-      <Filename>Ia32\ReadTsc.asm</Filename>

-      <Filename>Ia32\ReadPmc.asm</Filename>

-      <Filename>Ia32\Monitor.asm</Filename>

-      <Filename>Ia32\Mwait.asm</Filename>

-      <Filename>Ia32\EnablePaging32.asm</Filename>

-      <Filename>Ia32\DisablePaging32.asm</Filename>

-      <Filename>Ia32\EnablePaging64.asm</Filename>

-      <Filename>Ia32\Wbinvd.asm</Filename>

-      <Filename>Ia32\Invd.asm</Filename>

-      <Filename>Ia32\FlushCacheLine.asm</Filename>

-      <Filename>Ia32\InterlockedIncrement.asm</Filename>

-      <Filename>Ia32\InterlockedDecrement.asm</Filename>

-      <Filename>Ia32\InterlockedCompareExchange32.asm</Filename>

-      <Filename>Ia32\InterlockedCompareExchange64.asm</Filename>

-      <Filename>Ia32\EnableInterrupts.asm</Filename>

-      <Filename>Ia32\DisableInterrupts.asm</Filename>

-      <Filename>Ia32\EnableDisableInterrupts.asm</Filename>

-      <Filename>Ia32\CpuSleep.asm</Filename>

-      <Filename>Ia32\CpuPause.asm</Filename>

-      <Filename>Ia32\CpuBreakpoint.asm</Filename>

-      <Filename>Ia32\CpuFlushTlb.asm</Filename>

-      <Filename>Ia32\Thunk16.asm</Filename>

+      <Filename>Ia32/Non-existing.c</Filename>

+      <Filename>Ia32/LShiftU64.asm</Filename>

+      <Filename>Ia32/RShiftU64.asm</Filename>

+      <Filename>Ia32/ARShiftU64.asm</Filename>

+      <Filename>Ia32/LRotU64.asm</Filename>

+      <Filename>Ia32/RRotU64.asm</Filename>

+      <Filename>Ia32/MultU64x32.asm</Filename>

+      <Filename>Ia32/MultU64x64.asm</Filename>

+      <Filename>Ia32/DivU64x32.asm</Filename>

+      <Filename>Ia32/ModU64x32.asm</Filename>

+      <Filename>Ia32/DivU64x32Remainder.asm</Filename>

+      <Filename>Ia32/DivU64x64Remainder.asm</Filename>

+      <Filename>Ia32/DivS64x64Remainder.c</Filename>

+      <Filename>Ia32/SwapBytes64.asm</Filename>

+      <Filename>Ia32/SetJump.asm</Filename>

+      <Filename>Ia32/LongJump.asm</Filename>

+      <Filename>Ia32/SwitchStack.c</Filename>

+      <Filename>Ia32/CpuId.asm</Filename>

+      <Filename>Ia32/ReadEflags.asm</Filename>

+      <Filename>Ia32/ReadMsr64.asm</Filename>

+      <Filename>Ia32/WriteMsr32.asm</Filename>

+      <Filename>Ia32/WriteMsr64.asm</Filename>

+      <Filename>Ia32/ReadCr0.asm</Filename>

+      <Filename>Ia32/ReadCr2.asm</Filename>

+      <Filename>Ia32/ReadCr3.asm</Filename>

+      <Filename>Ia32/ReadCr4.asm</Filename>

+      <Filename>Ia32/WriteCr0.asm</Filename>

+      <Filename>Ia32/WriteCr2.asm</Filename>

+      <Filename>Ia32/WriteCr3.asm</Filename>

+      <Filename>Ia32/WriteCr4.asm</Filename>

+      <Filename>Ia32/ReadDr0.asm</Filename>

+      <Filename>Ia32/ReadDr1.asm</Filename>

+      <Filename>Ia32/ReadDr2.asm</Filename>

+      <Filename>Ia32/ReadDr3.asm</Filename>

+      <Filename>Ia32/ReadDr4.asm</Filename>

+      <Filename>Ia32/ReadDr5.asm</Filename>

+      <Filename>Ia32/ReadDr6.asm</Filename>

+      <Filename>Ia32/ReadDr7.asm</Filename>

+      <Filename>Ia32/WriteDr0.asm</Filename>

+      <Filename>Ia32/WriteDr1.asm</Filename>

+      <Filename>Ia32/WriteDr2.asm</Filename>

+      <Filename>Ia32/WriteDr3.asm</Filename>

+      <Filename>Ia32/WriteDr4.asm</Filename>

+      <Filename>Ia32/WriteDr5.asm</Filename>

+      <Filename>Ia32/WriteDr6.asm</Filename>

+      <Filename>Ia32/WriteDr7.asm</Filename>

+      <Filename>Ia32/ReadCs.asm</Filename>

+      <Filename>Ia32/ReadDs.asm</Filename>

+      <Filename>Ia32/ReadEs.asm</Filename>

+      <Filename>Ia32/ReadFs.asm</Filename>

+      <Filename>Ia32/ReadGs.asm</Filename>

+      <Filename>Ia32/ReadSs.asm</Filename>

+      <Filename>Ia32/ReadTr.asm</Filename>

+      <Filename>Ia32/ReadGdtr.asm</Filename>

+      <Filename>Ia32/WriteGdtr.asm</Filename>

+      <Filename>Ia32/ReadIdtr.asm</Filename>

+      <Filename>Ia32/WriteIdtr.asm</Filename>

+      <Filename>Ia32/ReadLdtr.asm</Filename>

+      <Filename>Ia32/WriteLdtr.asm</Filename>

+      <Filename>Ia32/FxSave.asm</Filename>

+      <Filename>Ia32/FxRestore.asm</Filename>

+      <Filename>Ia32/ReadMm0.asm</Filename>

+      <Filename>Ia32/ReadMm1.asm</Filename>

+      <Filename>Ia32/ReadMm2.asm</Filename>

+      <Filename>Ia32/ReadMm3.asm</Filename>

+      <Filename>Ia32/ReadMm4.asm</Filename>

+      <Filename>Ia32/ReadMm5.asm</Filename>

+      <Filename>Ia32/ReadMm6.asm</Filename>

+      <Filename>Ia32/ReadMm7.asm</Filename>

+      <Filename>Ia32/WriteMm0.asm</Filename>

+      <Filename>Ia32/WriteMm1.asm</Filename>

+      <Filename>Ia32/WriteMm2.asm</Filename>

+      <Filename>Ia32/WriteMm3.asm</Filename>

+      <Filename>Ia32/WriteMm4.asm</Filename>

+      <Filename>Ia32/WriteMm5.asm</Filename>

+      <Filename>Ia32/WriteMm6.asm</Filename>

+      <Filename>Ia32/WriteMm7.asm</Filename>

+      <Filename>Ia32/ReadTsc.asm</Filename>

+      <Filename>Ia32/ReadPmc.asm</Filename>

+      <Filename>Ia32/Monitor.asm</Filename>

+      <Filename>Ia32/Mwait.asm</Filename>

+      <Filename>Ia32/EnablePaging32.asm</Filename>

+      <Filename>Ia32/DisablePaging32.asm</Filename>

+      <Filename>Ia32/EnablePaging64.asm</Filename>

+      <Filename>Ia32/Wbinvd.asm</Filename>

+      <Filename>Ia32/Invd.asm</Filename>

+      <Filename>Ia32/FlushCacheLine.asm</Filename>

+      <Filename>Ia32/InterlockedIncrement.asm</Filename>

+      <Filename>Ia32/InterlockedDecrement.asm</Filename>

+      <Filename>Ia32/InterlockedCompareExchange32.asm</Filename>

+      <Filename>Ia32/InterlockedCompareExchange64.asm</Filename>

+      <Filename>Ia32/EnableInterrupts.asm</Filename>

+      <Filename>Ia32/DisableInterrupts.asm</Filename>

+      <Filename>Ia32/EnableDisableInterrupts.asm</Filename>

+      <Filename>Ia32/CpuSleep.asm</Filename>

+      <Filename>Ia32/CpuPause.asm</Filename>

+      <Filename>Ia32/CpuBreakpoint.asm</Filename>

+      <Filename>Ia32/CpuFlushTlb.asm</Filename>

+      <Filename>Ia32/Thunk16.asm</Filename>

     </Arch>

     <Arch ArchType="X64">

       <Filename>x86LowLevel.c</Filename>

       <Filename>x86Thunk.c</Filename>

       <Filename>Unaligned.c</Filename>

       <Filename>Math64.c</Filename>

-      <Filename>x64\Non-existing.c</Filename>

-      <Filename>x64\SwitchStack.asm</Filename>

-      <Filename>x64\SetJump.asm</Filename>

-      <Filename>x64\LongJump.asm</Filename>

-      <Filename>x64\CpuId.asm</Filename>

-      <Filename>x64\ReadEflags.asm</Filename>

-      <Filename>x64\ReadMsr32.asm</Filename>

-      <Filename>x64\ReadMsr64.asm</Filename>

-      <Filename>x64\WriteMsr32.asm</Filename>

-      <Filename>x64\WriteMsr64.asm</Filename>

-      <Filename>x64\ReadCr0.asm</Filename>

-      <Filename>x64\ReadCr2.asm</Filename>

-      <Filename>x64\ReadCr3.asm</Filename>

-      <Filename>x64\ReadCr4.asm</Filename>

-      <Filename>x64\WriteCr0.asm</Filename>

-      <Filename>x64\WriteCr2.asm</Filename>

-      <Filename>x64\WriteCr3.asm</Filename>

-      <Filename>x64\WriteCr4.asm</Filename>

-      <Filename>x64\ReadDr0.asm</Filename>

-      <Filename>x64\ReadDr1.asm</Filename>

-      <Filename>x64\ReadDr2.asm</Filename>

-      <Filename>x64\ReadDr3.asm</Filename>

-      <Filename>x64\ReadDr4.asm</Filename>

-      <Filename>x64\ReadDr5.asm</Filename>

-      <Filename>x64\ReadDr6.asm</Filename>

-      <Filename>x64\ReadDr7.asm</Filename>

-      <Filename>x64\WriteDr0.asm</Filename>

-      <Filename>x64\WriteDr1.asm</Filename>

-      <Filename>x64\WriteDr2.asm</Filename>

-      <Filename>x64\WriteDr3.asm</Filename>

-      <Filename>x64\WriteDr4.asm</Filename>

-      <Filename>x64\WriteDr5.asm</Filename>

-      <Filename>x64\WriteDr6.asm</Filename>

-      <Filename>x64\WriteDr7.asm</Filename>

-      <Filename>x64\ReadCs.asm</Filename>

-      <Filename>x64\ReadDs.asm</Filename>

-      <Filename>x64\ReadEs.asm</Filename>

-      <Filename>x64\ReadFs.asm</Filename>

-      <Filename>x64\ReadGs.asm</Filename>

-      <Filename>x64\ReadSs.asm</Filename>

-      <Filename>x64\ReadTr.asm</Filename>

-      <Filename>x64\ReadGdtr.asm</Filename>

-      <Filename>x64\WriteGdtr.asm</Filename>

-      <Filename>x64\ReadIdtr.asm</Filename>

-      <Filename>x64\WriteIdtr.asm</Filename>

-      <Filename>x64\ReadLdtr.asm</Filename>

-      <Filename>x64\WriteLdtr.asm</Filename>

-      <Filename>x64\FxSave.asm</Filename>

-      <Filename>x64\FxRestore.asm</Filename>

-      <Filename>x64\ReadMm0.asm</Filename>

-      <Filename>x64\ReadMm1.asm</Filename>

-      <Filename>x64\ReadMm2.asm</Filename>

-      <Filename>x64\ReadMm3.asm</Filename>

-      <Filename>x64\ReadMm4.asm</Filename>

-      <Filename>x64\ReadMm5.asm</Filename>

-      <Filename>x64\ReadMm6.asm</Filename>

-      <Filename>x64\ReadMm7.asm</Filename>

-      <Filename>x64\WriteMm0.asm</Filename>

-      <Filename>x64\WriteMm1.asm</Filename>

-      <Filename>x64\WriteMm2.asm</Filename>

-      <Filename>x64\WriteMm3.asm</Filename>

-      <Filename>x64\WriteMm4.asm</Filename>

-      <Filename>x64\WriteMm5.asm</Filename>

-      <Filename>x64\WriteMm6.asm</Filename>

-      <Filename>x64\WriteMm7.asm</Filename>

-      <Filename>x64\ReadTsc.asm</Filename>

-      <Filename>x64\ReadPmc.asm</Filename>

-      <Filename>x64\Monitor.asm</Filename>

-      <Filename>x64\Mwait.asm</Filename>

-      <Filename>x64\DisablePaging64.asm</Filename>

-      <Filename>x64\Wbinvd.asm</Filename>

-      <Filename>x64\Invd.asm</Filename>

-      <Filename>x64\FlushCacheLine.asm</Filename>

-      <Filename>x64\InterlockedIncrement.asm</Filename>

-      <Filename>x64\InterlockedDecrement.asm</Filename>

-      <Filename>x64\InterlockedCompareExchange32.asm</Filename>

-      <Filename>x64\InterlockedCompareExchange64.asm</Filename>

-      <Filename>x64\EnableInterrupts.asm</Filename>

-      <Filename>x64\DisableInterrupts.asm</Filename>

-      <Filename>x64\EnableDisableInterrupts.asm</Filename>

-      <Filename>x64\CpuSleep.asm</Filename>

-      <Filename>x64\CpuPause.asm</Filename>

-      <Filename>x64\CpuBreakpoint.asm</Filename>

-      <Filename>x64\CpuFlushTlb.asm</Filename>

-      <Filename>x64\Thunk16.asm</Filename>

+      <Filename>x64/Non-existing.c</Filename>

+      <Filename>x64/SwitchStack.asm</Filename>

+      <Filename>x64/SetJump.asm</Filename>

+      <Filename>x64/LongJump.asm</Filename>

+      <Filename>x64/CpuId.asm</Filename>

+      <Filename>x64/ReadEflags.asm</Filename>

+      <Filename>x64/ReadMsr32.asm</Filename>

+      <Filename>x64/ReadMsr64.asm</Filename>

+      <Filename>x64/WriteMsr32.asm</Filename>

+      <Filename>x64/WriteMsr64.asm</Filename>

+      <Filename>x64/ReadCr0.asm</Filename>

+      <Filename>x64/ReadCr2.asm</Filename>

+      <Filename>x64/ReadCr3.asm</Filename>

+      <Filename>x64/ReadCr4.asm</Filename>

+      <Filename>x64/WriteCr0.asm</Filename>

+      <Filename>x64/WriteCr2.asm</Filename>

+      <Filename>x64/WriteCr3.asm</Filename>

+      <Filename>x64/WriteCr4.asm</Filename>

+      <Filename>x64/ReadDr0.asm</Filename>

+      <Filename>x64/ReadDr1.asm</Filename>

+      <Filename>x64/ReadDr2.asm</Filename>

+      <Filename>x64/ReadDr3.asm</Filename>

+      <Filename>x64/ReadDr4.asm</Filename>

+      <Filename>x64/ReadDr5.asm</Filename>

+      <Filename>x64/ReadDr6.asm</Filename>

+      <Filename>x64/ReadDr7.asm</Filename>

+      <Filename>x64/WriteDr0.asm</Filename>

+      <Filename>x64/WriteDr1.asm</Filename>

+      <Filename>x64/WriteDr2.asm</Filename>

+      <Filename>x64/WriteDr3.asm</Filename>

+      <Filename>x64/WriteDr4.asm</Filename>

+      <Filename>x64/WriteDr5.asm</Filename>

+      <Filename>x64/WriteDr6.asm</Filename>

+      <Filename>x64/WriteDr7.asm</Filename>

+      <Filename>x64/ReadCs.asm</Filename>

+      <Filename>x64/ReadDs.asm</Filename>

+      <Filename>x64/ReadEs.asm</Filename>

+      <Filename>x64/ReadFs.asm</Filename>

+      <Filename>x64/ReadGs.asm</Filename>

+      <Filename>x64/ReadSs.asm</Filename>

+      <Filename>x64/ReadTr.asm</Filename>

+      <Filename>x64/ReadGdtr.asm</Filename>

+      <Filename>x64/WriteGdtr.asm</Filename>

+      <Filename>x64/ReadIdtr.asm</Filename>

+      <Filename>x64/WriteIdtr.asm</Filename>

+      <Filename>x64/ReadLdtr.asm</Filename>

+      <Filename>x64/WriteLdtr.asm</Filename>

+      <Filename>x64/FxSave.asm</Filename>

+      <Filename>x64/FxRestore.asm</Filename>

+      <Filename>x64/ReadMm0.asm</Filename>

+      <Filename>x64/ReadMm1.asm</Filename>

+      <Filename>x64/ReadMm2.asm</Filename>

+      <Filename>x64/ReadMm3.asm</Filename>

+      <Filename>x64/ReadMm4.asm</Filename>

+      <Filename>x64/ReadMm5.asm</Filename>

+      <Filename>x64/ReadMm6.asm</Filename>

+      <Filename>x64/ReadMm7.asm</Filename>

+      <Filename>x64/WriteMm0.asm</Filename>

+      <Filename>x64/WriteMm1.asm</Filename>

+      <Filename>x64/WriteMm2.asm</Filename>

+      <Filename>x64/WriteMm3.asm</Filename>

+      <Filename>x64/WriteMm4.asm</Filename>

+      <Filename>x64/WriteMm5.asm</Filename>

+      <Filename>x64/WriteMm6.asm</Filename>

+      <Filename>x64/WriteMm7.asm</Filename>

+      <Filename>x64/ReadTsc.asm</Filename>

+      <Filename>x64/ReadPmc.asm</Filename>

+      <Filename>x64/Monitor.asm</Filename>

+      <Filename>x64/Mwait.asm</Filename>

+      <Filename>x64/DisablePaging64.asm</Filename>

+      <Filename>x64/Wbinvd.asm</Filename>

+      <Filename>x64/Invd.asm</Filename>

+      <Filename>x64/FlushCacheLine.asm</Filename>

+      <Filename>x64/InterlockedIncrement.asm</Filename>

+      <Filename>x64/InterlockedDecrement.asm</Filename>

+      <Filename>x64/InterlockedCompareExchange32.asm</Filename>

+      <Filename>x64/InterlockedCompareExchange64.asm</Filename>

+      <Filename>x64/EnableInterrupts.asm</Filename>

+      <Filename>x64/DisableInterrupts.asm</Filename>

+      <Filename>x64/EnableDisableInterrupts.asm</Filename>

+      <Filename>x64/CpuSleep.asm</Filename>

+      <Filename>x64/CpuPause.asm</Filename>

+      <Filename>x64/CpuBreakpoint.asm</Filename>

+      <Filename>x64/CpuFlushTlb.asm</Filename>

+      <Filename>x64/Thunk16.asm</Filename>

     </Arch>

     <Arch ArchType="IPF">

       <Filename>Math64.c</Filename>

-      <Filename>Ipf\setjmp.s</Filename>

-      <Filename>Ipf\SwitchStack.s</Filename>

-      <Filename>Ipf\Unaligned.c</Filename>

-      <Filename>Ipf\CpuBreakpoint.c</Filename>

-      <Filename>Ipf\InterlockedCompareExchange32.s</Filename>

-      <Filename>Ipf\InterlockedCompareExchange64.s</Filename>

-      <Filename>Ipf\Synchronization.c</Filename>

+      <Filename>Ipf/setjmp.s</Filename>

+      <Filename>Ipf/SwitchStack.s</Filename>

+      <Filename>Ipf/Unaligned.c</Filename>

+      <Filename>Ipf/CpuBreakpoint.c</Filename>

+      <Filename>Ipf/InterlockedCompareExchange32.s</Filename>

+      <Filename>Ipf/InterlockedCompareExchange64.s</Filename>

+      <Filename>Ipf/Synchronization.c</Filename>

     </Arch>

     <Arch ArchType="EBC">

       <Filename>Math64.c</Filename>

       <Filename>SwitchStack.c</Filename>

       <Filename>SetJumpLongJump.c</Filename>

       <Filename>Unaligned.c</Filename>

-      <Filename>Ebc\CpuBreakpoint.c</Filename>

+      <Filename>Ebc/CpuBreakpoint.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/MdePkg/Library/BaseLib/build.xml b/MdePkg/Library/BaseLib/build.xml
index 7533da8ddc..224e8a9b1d 100644
--- a/MdePkg/Library/BaseLib/build.xml
+++ b/MdePkg/Library/BaseLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseLib">

-      <GenBuild baseName="BaseLib" mbdFilename="${MODULE_DIR}\BaseLib.mbd" msaFilename="${MODULE_DIR}\BaseLib.msa"/>

+      <GenBuild baseName="BaseLib" mbdFilename="${MODULE_DIR}/BaseLib.mbd" msaFilename="${MODULE_DIR}/BaseLib.msa"/>

    </target>

    <target depends="BaseLib_clean" name="clean"/>

    <target depends="BaseLib_cleanall" name="cleanall"/>

    <target name="BaseLib_clean">

-      <OutputDirSetup baseName="BaseLib" mbdFilename="${MODULE_DIR}\BaseLib.mbd" msaFilename="${MODULE_DIR}\BaseLib.msa"/>

+      <OutputDirSetup baseName="BaseLib" mbdFilename="${MODULE_DIR}/BaseLib.mbd" msaFilename="${MODULE_DIR}/BaseLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseLib_cleanall">

-      <OutputDirSetup baseName="BaseLib" mbdFilename="${MODULE_DIR}\BaseLib.mbd" msaFilename="${MODULE_DIR}\BaseLib.msa"/>

+      <OutputDirSetup baseName="BaseLib" mbdFilename="${MODULE_DIR}/BaseLib.mbd" msaFilename="${MODULE_DIR}/BaseLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseMemoryLib/build.xml b/MdePkg/Library/BaseMemoryLib/build.xml
index fd1b805b43..040f1390f9 100644
--- a/MdePkg/Library/BaseMemoryLib/build.xml
+++ b/MdePkg/Library/BaseMemoryLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseMemoryLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseMemoryLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseMemoryLib">

-      <GenBuild baseName="BaseMemoryLib" mbdFilename="${MODULE_DIR}\BaseMemoryLib.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLib.msa"/>

+      <GenBuild baseName="BaseMemoryLib" mbdFilename="${MODULE_DIR}/BaseMemoryLib.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLib.msa"/>

    </target>

    <target depends="BaseMemoryLib_clean" name="clean"/>

    <target depends="BaseMemoryLib_cleanall" name="cleanall"/>

    <target name="BaseMemoryLib_clean">

-      <OutputDirSetup baseName="BaseMemoryLib" mbdFilename="${MODULE_DIR}\BaseMemoryLib.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLib.msa"/>

+      <OutputDirSetup baseName="BaseMemoryLib" mbdFilename="${MODULE_DIR}/BaseMemoryLib.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseMemoryLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseMemoryLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseMemoryLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseMemoryLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseMemoryLib_cleanall">

-      <OutputDirSetup baseName="BaseMemoryLib" mbdFilename="${MODULE_DIR}\BaseMemoryLib.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLib.msa"/>

+      <OutputDirSetup baseName="BaseMemoryLib" mbdFilename="${MODULE_DIR}/BaseMemoryLib.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseMemoryLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseMemoryLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseMemoryLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseMemoryLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
index 37abf06853..552c019cdf 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
+++ b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
@@ -39,17 +39,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Arch ArchType="IA32">

       <Filename>MemLibGuid.c</Filename>

       <Filename>MemLibWrapper.c</Filename>

-      <Filename>Ia32\CopyMem.asm</Filename>

-      <Filename>Ia32\SetMem.asm</Filename>

-      <Filename>Ia32\ZeroMem.asm</Filename>

-      <Filename>Ia32\SetMem16.asm</Filename>

-      <Filename>Ia32\SetMem32.asm</Filename>

-      <Filename>Ia32\SetMem64.asm</Filename>

-      <Filename>Ia32\CompareMem.asm</Filename>

-      <Filename>Ia32\ScanMem8.asm</Filename>

-      <Filename>Ia32\ScanMem16.asm</Filename>

-      <Filename>Ia32\ScanMem32.asm</Filename>

-      <Filename>Ia32\ScanMem64.asm</Filename>

+      <Filename>Ia32/CopyMem.asm</Filename>

+      <Filename>Ia32/SetMem.asm</Filename>

+      <Filename>Ia32/ZeroMem.asm</Filename>

+      <Filename>Ia32/SetMem16.asm</Filename>

+      <Filename>Ia32/SetMem32.asm</Filename>

+      <Filename>Ia32/SetMem64.asm</Filename>

+      <Filename>Ia32/CompareMem.asm</Filename>

+      <Filename>Ia32/ScanMem8.asm</Filename>

+      <Filename>Ia32/ScanMem16.asm</Filename>

+      <Filename>Ia32/ScanMem32.asm</Filename>

+      <Filename>Ia32/ScanMem64.asm</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/MdePkg/Library/BaseMemoryLibMmx/build.xml b/MdePkg/Library/BaseMemoryLibMmx/build.xml
index 13a9a993ea..8b72825fb5 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/build.xml
+++ b/MdePkg/Library/BaseMemoryLibMmx/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseMemoryLibMmx"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseMemoryLibMmx"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseMemoryLibMmx">

-      <GenBuild baseName="BaseMemoryLibMmx" mbdFilename="${MODULE_DIR}\BaseMemoryLibMmx.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLibMmx.msa"/>

+      <GenBuild baseName="BaseMemoryLibMmx" mbdFilename="${MODULE_DIR}/BaseMemoryLibMmx.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLibMmx.msa"/>

    </target>

    <target depends="BaseMemoryLibMmx_clean" name="clean"/>

    <target depends="BaseMemoryLibMmx_cleanall" name="cleanall"/>

    <target name="BaseMemoryLibMmx_clean">

-      <OutputDirSetup baseName="BaseMemoryLibMmx" mbdFilename="${MODULE_DIR}\BaseMemoryLibMmx.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLibMmx.msa"/>

+      <OutputDirSetup baseName="BaseMemoryLibMmx" mbdFilename="${MODULE_DIR}/BaseMemoryLibMmx.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLibMmx.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseMemoryLibMmx_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseMemoryLibMmx_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseMemoryLibMmx_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseMemoryLibMmx_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseMemoryLibMmx_cleanall">

-      <OutputDirSetup baseName="BaseMemoryLibMmx" mbdFilename="${MODULE_DIR}\BaseMemoryLibMmx.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLibMmx.msa"/>

+      <OutputDirSetup baseName="BaseMemoryLibMmx" mbdFilename="${MODULE_DIR}/BaseMemoryLibMmx.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLibMmx.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseMemoryLibMmx_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseMemoryLibMmx_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseMemoryLibMmx_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseMemoryLibMmx_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
index 24c67a044e..19c92471fa 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
+++ b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
@@ -39,32 +39,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Arch ArchType="IA32">

       <Filename>MemLibGuid.c</Filename>

       <Filename>MemLibWrapper.c</Filename>

-      <Filename>Ia32\CopyMem.asm</Filename>

-      <Filename>Ia32\SetMem.asm</Filename>

-      <Filename>Ia32\SetMem16.asm</Filename>

-      <Filename>Ia32\SetMem32.asm</Filename>

-      <Filename>Ia32\SetMem64.asm</Filename>

-      <Filename>Ia32\ZeroMem.asm</Filename>

-      <Filename>Ia32\CompareMem.asm</Filename>

-      <Filename>Ia32\ScanMem8.asm</Filename>

-      <Filename>Ia32\ScanMem16.asm</Filename>

-      <Filename>Ia32\ScanMem32.asm</Filename>

-      <Filename>Ia32\ScanMem64.asm</Filename>

+      <Filename>Ia32/CopyMem.asm</Filename>

+      <Filename>Ia32/SetMem.asm</Filename>

+      <Filename>Ia32/SetMem16.asm</Filename>

+      <Filename>Ia32/SetMem32.asm</Filename>

+      <Filename>Ia32/SetMem64.asm</Filename>

+      <Filename>Ia32/ZeroMem.asm</Filename>

+      <Filename>Ia32/CompareMem.asm</Filename>

+      <Filename>Ia32/ScanMem8.asm</Filename>

+      <Filename>Ia32/ScanMem16.asm</Filename>

+      <Filename>Ia32/ScanMem32.asm</Filename>

+      <Filename>Ia32/ScanMem64.asm</Filename>

     </Arch>

     <Arch ArchType="X64">

       <Filename>MemLibGuid.c</Filename>

       <Filename>MemLibWrapper.c</Filename>

-      <Filename>x64\CopyMem.asm</Filename>

-      <Filename>x64\SetMem.asm</Filename>

-      <Filename>x64\SetMem16.asm</Filename>

-      <Filename>x64\SetMem32.asm</Filename>

-      <Filename>x64\SetMem64.asm</Filename>

-      <Filename>x64\ZeroMem.asm</Filename>

-      <Filename>x64\CompareMem.asm</Filename>

-      <Filename>x64\ScanMem8.asm</Filename>

-      <Filename>x64\ScanMem16.asm</Filename>

-      <Filename>x64\ScanMem32.asm</Filename>

-      <Filename>x64\ScanMem64.asm</Filename>

+      <Filename>x64/CopyMem.asm</Filename>

+      <Filename>x64/SetMem.asm</Filename>

+      <Filename>x64/SetMem16.asm</Filename>

+      <Filename>x64/SetMem32.asm</Filename>

+      <Filename>x64/SetMem64.asm</Filename>

+      <Filename>x64/ZeroMem.asm</Filename>

+      <Filename>x64/CompareMem.asm</Filename>

+      <Filename>x64/ScanMem8.asm</Filename>

+      <Filename>x64/ScanMem16.asm</Filename>

+      <Filename>x64/ScanMem32.asm</Filename>

+      <Filename>x64/ScanMem64.asm</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/build.xml b/MdePkg/Library/BaseMemoryLibRepStr/build.xml
index cc6423b839..66b1335ee5 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/build.xml
+++ b/MdePkg/Library/BaseMemoryLibRepStr/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseMemoryLibRepStr"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseMemoryLibRepStr"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseMemoryLibRepStr">

-      <GenBuild baseName="BaseMemoryLibRepStr" mbdFilename="${MODULE_DIR}\BaseMemoryLibRepStr.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLibRepStr.msa"/>

+      <GenBuild baseName="BaseMemoryLibRepStr" mbdFilename="${MODULE_DIR}/BaseMemoryLibRepStr.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLibRepStr.msa"/>

    </target>

    <target depends="BaseMemoryLibRepStr_clean" name="clean"/>

    <target depends="BaseMemoryLibRepStr_cleanall" name="cleanall"/>

    <target name="BaseMemoryLibRepStr_clean">

-      <OutputDirSetup baseName="BaseMemoryLibRepStr" mbdFilename="${MODULE_DIR}\BaseMemoryLibRepStr.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLibRepStr.msa"/>

+      <OutputDirSetup baseName="BaseMemoryLibRepStr" mbdFilename="${MODULE_DIR}/BaseMemoryLibRepStr.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLibRepStr.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseMemoryLibRepStr_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseMemoryLibRepStr_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseMemoryLibRepStr_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseMemoryLibRepStr_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseMemoryLibRepStr_cleanall">

-      <OutputDirSetup baseName="BaseMemoryLibRepStr" mbdFilename="${MODULE_DIR}\BaseMemoryLibRepStr.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLibRepStr.msa"/>

+      <OutputDirSetup baseName="BaseMemoryLibRepStr" mbdFilename="${MODULE_DIR}/BaseMemoryLibRepStr.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLibRepStr.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseMemoryLibRepStr_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseMemoryLibRepStr_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseMemoryLibRepStr_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseMemoryLibRepStr_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
index 6336f58b85..a208b2c40c 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
+++ b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
@@ -39,32 +39,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Arch ArchType="IA32">

       <Filename>MemLibGuid.c</Filename>

       <Filename>MemLibWrapper.c</Filename>

-      <Filename>Ia32\CopyMem.asm</Filename>

-      <Filename>Ia32\SetMem.asm</Filename>

-      <Filename>Ia32\SetMem16.asm</Filename>

-      <Filename>Ia32\SetMem32.asm</Filename>

-      <Filename>Ia32\SetMem64.asm</Filename>

-      <Filename>Ia32\ZeroMem.asm</Filename>

-      <Filename>Ia32\CompareMem.asm</Filename>

-      <Filename>Ia32\ScanMem8.asm</Filename>

-      <Filename>Ia32\ScanMem16.asm</Filename>

-      <Filename>Ia32\ScanMem32.asm</Filename>

-      <Filename>Ia32\ScanMem64.asm</Filename>

+      <Filename>Ia32/CopyMem.asm</Filename>

+      <Filename>Ia32/SetMem.asm</Filename>

+      <Filename>Ia32/SetMem16.asm</Filename>

+      <Filename>Ia32/SetMem32.asm</Filename>

+      <Filename>Ia32/SetMem64.asm</Filename>

+      <Filename>Ia32/ZeroMem.asm</Filename>

+      <Filename>Ia32/CompareMem.asm</Filename>

+      <Filename>Ia32/ScanMem8.asm</Filename>

+      <Filename>Ia32/ScanMem16.asm</Filename>

+      <Filename>Ia32/ScanMem32.asm</Filename>

+      <Filename>Ia32/ScanMem64.asm</Filename>

     </Arch>

     <Arch ArchType="X64">

       <Filename>MemLibGuid.c</Filename>

       <Filename>MemLibWrapper.c</Filename>

-      <Filename>x64\CopyMem.asm</Filename>

-      <Filename>x64\SetMem.asm</Filename>

-      <Filename>x64\SetMem16.asm</Filename>

-      <Filename>x64\SetMem32.asm</Filename>

-      <Filename>x64\SetMem64.asm</Filename>

-      <Filename>x64\ZeroMem.asm</Filename>

-      <Filename>x64\CompareMem.asm</Filename>

-      <Filename>x64\ScanMem8.asm</Filename>

-      <Filename>x64\ScanMem16.asm</Filename>

-      <Filename>x64\ScanMem32.asm</Filename>

-      <Filename>x64\ScanMem64.asm</Filename>

+      <Filename>x64/CopyMem.asm</Filename>

+      <Filename>x64/SetMem.asm</Filename>

+      <Filename>x64/SetMem16.asm</Filename>

+      <Filename>x64/SetMem32.asm</Filename>

+      <Filename>x64/SetMem64.asm</Filename>

+      <Filename>x64/ZeroMem.asm</Filename>

+      <Filename>x64/CompareMem.asm</Filename>

+      <Filename>x64/ScanMem8.asm</Filename>

+      <Filename>x64/ScanMem16.asm</Filename>

+      <Filename>x64/ScanMem32.asm</Filename>

+      <Filename>x64/ScanMem64.asm</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/MdePkg/Library/BaseMemoryLibSse2/build.xml b/MdePkg/Library/BaseMemoryLibSse2/build.xml
index 39482b0bfa..1a5866a60c 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/build.xml
+++ b/MdePkg/Library/BaseMemoryLibSse2/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseMemoryLibSse2"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseMemoryLibSse2"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseMemoryLibSse2">

-      <GenBuild baseName="BaseMemoryLibSse2" mbdFilename="${MODULE_DIR}\BaseMemoryLibSse2.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLibSse2.msa"/>

+      <GenBuild baseName="BaseMemoryLibSse2" mbdFilename="${MODULE_DIR}/BaseMemoryLibSse2.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLibSse2.msa"/>

    </target>

    <target depends="BaseMemoryLibSse2_clean" name="clean"/>

    <target depends="BaseMemoryLibSse2_cleanall" name="cleanall"/>

    <target name="BaseMemoryLibSse2_clean">

-      <OutputDirSetup baseName="BaseMemoryLibSse2" mbdFilename="${MODULE_DIR}\BaseMemoryLibSse2.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLibSse2.msa"/>

+      <OutputDirSetup baseName="BaseMemoryLibSse2" mbdFilename="${MODULE_DIR}/BaseMemoryLibSse2.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLibSse2.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseMemoryLibSse2_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseMemoryLibSse2_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseMemoryLibSse2_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseMemoryLibSse2_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseMemoryLibSse2_cleanall">

-      <OutputDirSetup baseName="BaseMemoryLibSse2" mbdFilename="${MODULE_DIR}\BaseMemoryLibSse2.mbd" msaFilename="${MODULE_DIR}\BaseMemoryLibSse2.msa"/>

+      <OutputDirSetup baseName="BaseMemoryLibSse2" mbdFilename="${MODULE_DIR}/BaseMemoryLibSse2.mbd" msaFilename="${MODULE_DIR}/BaseMemoryLibSse2.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseMemoryLibSse2_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseMemoryLibSse2_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseMemoryLibSse2_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseMemoryLibSse2_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BasePcdLibNull/build.xml b/MdePkg/Library/BasePcdLibNull/build.xml
index 2e4e22b070..1b436c30f4 100644
--- a/MdePkg/Library/BasePcdLibNull/build.xml
+++ b/MdePkg/Library/BasePcdLibNull/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BasePcdLibNull"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BasePcdLibNull"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BasePcdLibNull">

-      <GenBuild baseName="BasePcdLibNull" mbdFilename="${MODULE_DIR}\BasePcdLibNull.mbd" msaFilename="${MODULE_DIR}\BasePcdLibNull.msa"/>

+      <GenBuild baseName="BasePcdLibNull" mbdFilename="${MODULE_DIR}/BasePcdLibNull.mbd" msaFilename="${MODULE_DIR}/BasePcdLibNull.msa"/>

    </target>

    <target depends="BasePcdLibNull_clean" name="clean"/>

    <target depends="BasePcdLibNull_cleanall" name="cleanall"/>

    <target name="BasePcdLibNull_clean">

-      <OutputDirSetup baseName="BasePcdLibNull" mbdFilename="${MODULE_DIR}\BasePcdLibNull.mbd" msaFilename="${MODULE_DIR}\BasePcdLibNull.msa"/>

+      <OutputDirSetup baseName="BasePcdLibNull" mbdFilename="${MODULE_DIR}/BasePcdLibNull.mbd" msaFilename="${MODULE_DIR}/BasePcdLibNull.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePcdLibNull_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePcdLibNull_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePcdLibNull_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePcdLibNull_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BasePcdLibNull_cleanall">

-      <OutputDirSetup baseName="BasePcdLibNull" mbdFilename="${MODULE_DIR}\BasePcdLibNull.mbd" msaFilename="${MODULE_DIR}\BasePcdLibNull.msa"/>

+      <OutputDirSetup baseName="BasePcdLibNull" mbdFilename="${MODULE_DIR}/BasePcdLibNull.mbd" msaFilename="${MODULE_DIR}/BasePcdLibNull.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePcdLibNull_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePcdLibNull_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePcdLibNull_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePcdLibNull_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BasePciCf8Lib/build.xml b/MdePkg/Library/BasePciCf8Lib/build.xml
index fdf000bbbd..5bdefd255d 100644
--- a/MdePkg/Library/BasePciCf8Lib/build.xml
+++ b/MdePkg/Library/BasePciCf8Lib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BasePciCf8Lib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BasePciCf8Lib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BasePciCf8Lib">

-      <GenBuild baseName="BasePciCf8Lib" mbdFilename="${MODULE_DIR}\BasePciCf8Lib.mbd" msaFilename="${MODULE_DIR}\BasePciCf8Lib.msa"/>

+      <GenBuild baseName="BasePciCf8Lib" mbdFilename="${MODULE_DIR}/BasePciCf8Lib.mbd" msaFilename="${MODULE_DIR}/BasePciCf8Lib.msa"/>

    </target>

    <target depends="BasePciCf8Lib_clean" name="clean"/>

    <target depends="BasePciCf8Lib_cleanall" name="cleanall"/>

    <target name="BasePciCf8Lib_clean">

-      <OutputDirSetup baseName="BasePciCf8Lib" mbdFilename="${MODULE_DIR}\BasePciCf8Lib.mbd" msaFilename="${MODULE_DIR}\BasePciCf8Lib.msa"/>

+      <OutputDirSetup baseName="BasePciCf8Lib" mbdFilename="${MODULE_DIR}/BasePciCf8Lib.mbd" msaFilename="${MODULE_DIR}/BasePciCf8Lib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePciCf8Lib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePciCf8Lib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePciCf8Lib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePciCf8Lib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BasePciCf8Lib_cleanall">

-      <OutputDirSetup baseName="BasePciCf8Lib" mbdFilename="${MODULE_DIR}\BasePciCf8Lib.mbd" msaFilename="${MODULE_DIR}\BasePciCf8Lib.msa"/>

+      <OutputDirSetup baseName="BasePciCf8Lib" mbdFilename="${MODULE_DIR}/BasePciCf8Lib.mbd" msaFilename="${MODULE_DIR}/BasePciCf8Lib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePciCf8Lib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePciCf8Lib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePciCf8Lib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePciCf8Lib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BasePciExpressLib/build.xml b/MdePkg/Library/BasePciExpressLib/build.xml
index 576b73207a..d021c9e09c 100644
--- a/MdePkg/Library/BasePciExpressLib/build.xml
+++ b/MdePkg/Library/BasePciExpressLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BasePciExpressLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BasePciExpressLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BasePciExpressLib">

-      <GenBuild baseName="BasePciExpressLib" mbdFilename="${MODULE_DIR}\BasePciExpressLib.mbd" msaFilename="${MODULE_DIR}\BasePciExpressLib.msa"/>

+      <GenBuild baseName="BasePciExpressLib" mbdFilename="${MODULE_DIR}/BasePciExpressLib.mbd" msaFilename="${MODULE_DIR}/BasePciExpressLib.msa"/>

    </target>

    <target depends="BasePciExpressLib_clean" name="clean"/>

    <target depends="BasePciExpressLib_cleanall" name="cleanall"/>

    <target name="BasePciExpressLib_clean">

-      <OutputDirSetup baseName="BasePciExpressLib" mbdFilename="${MODULE_DIR}\BasePciExpressLib.mbd" msaFilename="${MODULE_DIR}\BasePciExpressLib.msa"/>

+      <OutputDirSetup baseName="BasePciExpressLib" mbdFilename="${MODULE_DIR}/BasePciExpressLib.mbd" msaFilename="${MODULE_DIR}/BasePciExpressLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePciExpressLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePciExpressLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePciExpressLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePciExpressLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BasePciExpressLib_cleanall">

-      <OutputDirSetup baseName="BasePciExpressLib" mbdFilename="${MODULE_DIR}\BasePciExpressLib.mbd" msaFilename="${MODULE_DIR}\BasePciExpressLib.msa"/>

+      <OutputDirSetup baseName="BasePciExpressLib" mbdFilename="${MODULE_DIR}/BasePciExpressLib.mbd" msaFilename="${MODULE_DIR}/BasePciExpressLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePciExpressLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePciExpressLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePciExpressLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePciExpressLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BasePciLibCf8/build.xml b/MdePkg/Library/BasePciLibCf8/build.xml
index 3e59bd0642..4e31f36bfe 100644
--- a/MdePkg/Library/BasePciLibCf8/build.xml
+++ b/MdePkg/Library/BasePciLibCf8/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BasePciLibCf8"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BasePciLibCf8"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BasePciLibCf8">

-      <GenBuild baseName="BasePciLibCf8" mbdFilename="${MODULE_DIR}\BasePciLibCf8.mbd" msaFilename="${MODULE_DIR}\BasePciLibCf8.msa"/>

+      <GenBuild baseName="BasePciLibCf8" mbdFilename="${MODULE_DIR}/BasePciLibCf8.mbd" msaFilename="${MODULE_DIR}/BasePciLibCf8.msa"/>

    </target>

    <target depends="BasePciLibCf8_clean" name="clean"/>

    <target depends="BasePciLibCf8_cleanall" name="cleanall"/>

    <target name="BasePciLibCf8_clean">

-      <OutputDirSetup baseName="BasePciLibCf8" mbdFilename="${MODULE_DIR}\BasePciLibCf8.mbd" msaFilename="${MODULE_DIR}\BasePciLibCf8.msa"/>

+      <OutputDirSetup baseName="BasePciLibCf8" mbdFilename="${MODULE_DIR}/BasePciLibCf8.mbd" msaFilename="${MODULE_DIR}/BasePciLibCf8.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePciLibCf8_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePciLibCf8_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePciLibCf8_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePciLibCf8_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BasePciLibCf8_cleanall">

-      <OutputDirSetup baseName="BasePciLibCf8" mbdFilename="${MODULE_DIR}\BasePciLibCf8.mbd" msaFilename="${MODULE_DIR}\BasePciLibCf8.msa"/>

+      <OutputDirSetup baseName="BasePciLibCf8" mbdFilename="${MODULE_DIR}/BasePciLibCf8.mbd" msaFilename="${MODULE_DIR}/BasePciLibCf8.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePciLibCf8_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePciLibCf8_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePciLibCf8_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePciLibCf8_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BasePciLibPciExpress/build.xml b/MdePkg/Library/BasePciLibPciExpress/build.xml
index 162f29e06e..ab530577e1 100644
--- a/MdePkg/Library/BasePciLibPciExpress/build.xml
+++ b/MdePkg/Library/BasePciLibPciExpress/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BasePciLibPciExpress"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BasePciLibPciExpress"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BasePciLibPciExpress">

-      <GenBuild baseName="BasePciLibPciExpress" mbdFilename="${MODULE_DIR}\BasePciLibPciExpress.mbd" msaFilename="${MODULE_DIR}\BasePciLibPciExpress.msa"/>

+      <GenBuild baseName="BasePciLibPciExpress" mbdFilename="${MODULE_DIR}/BasePciLibPciExpress.mbd" msaFilename="${MODULE_DIR}/BasePciLibPciExpress.msa"/>

    </target>

    <target depends="BasePciLibPciExpress_clean" name="clean"/>

    <target depends="BasePciLibPciExpress_cleanall" name="cleanall"/>

    <target name="BasePciLibPciExpress_clean">

-      <OutputDirSetup baseName="BasePciLibPciExpress" mbdFilename="${MODULE_DIR}\BasePciLibPciExpress.mbd" msaFilename="${MODULE_DIR}\BasePciLibPciExpress.msa"/>

+      <OutputDirSetup baseName="BasePciLibPciExpress" mbdFilename="${MODULE_DIR}/BasePciLibPciExpress.mbd" msaFilename="${MODULE_DIR}/BasePciLibPciExpress.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePciLibPciExpress_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePciLibPciExpress_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePciLibPciExpress_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePciLibPciExpress_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BasePciLibPciExpress_cleanall">

-      <OutputDirSetup baseName="BasePciLibPciExpress" mbdFilename="${MODULE_DIR}\BasePciLibPciExpress.mbd" msaFilename="${MODULE_DIR}\BasePciLibPciExpress.msa"/>

+      <OutputDirSetup baseName="BasePciLibPciExpress" mbdFilename="${MODULE_DIR}/BasePciLibPciExpress.mbd" msaFilename="${MODULE_DIR}/BasePciLibPciExpress.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePciLibPciExpress_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePciLibPciExpress_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePciLibPciExpress_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePciLibPciExpress_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BasePeCoffGetEntryPointLib/build.xml b/MdePkg/Library/BasePeCoffGetEntryPointLib/build.xml
index 4d74c32630..36286fc3a8 100644
--- a/MdePkg/Library/BasePeCoffGetEntryPointLib/build.xml
+++ b/MdePkg/Library/BasePeCoffGetEntryPointLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BasePeCoffGetEntryPointLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BasePeCoffGetEntryPointLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BasePeCoffGetEntryPointLib">

-      <GenBuild baseName="BasePeCoffGetEntryPointLib" mbdFilename="${MODULE_DIR}\BasePeCoffGetEntryPointLib.mbd" msaFilename="${MODULE_DIR}\BasePeCoffGetEntryPointLib.msa"/>

+      <GenBuild baseName="BasePeCoffGetEntryPointLib" mbdFilename="${MODULE_DIR}/BasePeCoffGetEntryPointLib.mbd" msaFilename="${MODULE_DIR}/BasePeCoffGetEntryPointLib.msa"/>

    </target>

    <target depends="BasePeCoffGetEntryPointLib_clean" name="clean"/>

    <target depends="BasePeCoffGetEntryPointLib_cleanall" name="cleanall"/>

    <target name="BasePeCoffGetEntryPointLib_clean">

-      <OutputDirSetup baseName="BasePeCoffGetEntryPointLib" mbdFilename="${MODULE_DIR}\BasePeCoffGetEntryPointLib.mbd" msaFilename="${MODULE_DIR}\BasePeCoffGetEntryPointLib.msa"/>

+      <OutputDirSetup baseName="BasePeCoffGetEntryPointLib" mbdFilename="${MODULE_DIR}/BasePeCoffGetEntryPointLib.mbd" msaFilename="${MODULE_DIR}/BasePeCoffGetEntryPointLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePeCoffGetEntryPointLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePeCoffGetEntryPointLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePeCoffGetEntryPointLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePeCoffGetEntryPointLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BasePeCoffGetEntryPointLib_cleanall">

-      <OutputDirSetup baseName="BasePeCoffGetEntryPointLib" mbdFilename="${MODULE_DIR}\BasePeCoffGetEntryPointLib.mbd" msaFilename="${MODULE_DIR}\BasePeCoffGetEntryPointLib.msa"/>

+      <OutputDirSetup baseName="BasePeCoffGetEntryPointLib" mbdFilename="${MODULE_DIR}/BasePeCoffGetEntryPointLib.mbd" msaFilename="${MODULE_DIR}/BasePeCoffGetEntryPointLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePeCoffGetEntryPointLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePeCoffGetEntryPointLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePeCoffGetEntryPointLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePeCoffGetEntryPointLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
index 534558c7fa..c5b4e7230d 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
@@ -38,16 +38,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <SourceFiles>

     <Filename>BasePeCoff.c</Filename>

     <Arch ArchType="IA32">

-      <Filename>ia32\PeCoffLoaderEx.c</Filename>

+      <Filename>ia32/PeCoffLoaderEx.c</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>x64\PeCoffLoaderEx.c</Filename>

+      <Filename>x64/PeCoffLoaderEx.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>ipf\PeCoffLoaderEx.c</Filename>

+      <Filename>ipf/PeCoffLoaderEx.c</Filename>

     </Arch>

     <Arch ArchType="EBC">

-      <Filename>ebc\PeCoffLoaderEx.c</Filename>

+      <Filename>ebc/PeCoffLoaderEx.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/MdePkg/Library/BasePeCoffLib/build.xml b/MdePkg/Library/BasePeCoffLib/build.xml
index 0aff39d00b..cd2e0fd0e9 100644
--- a/MdePkg/Library/BasePeCoffLib/build.xml
+++ b/MdePkg/Library/BasePeCoffLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BasePeCoffLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BasePeCoffLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BasePeCoffLib">

-      <GenBuild baseName="BasePeCoffLib" mbdFilename="${MODULE_DIR}\BasePeCoffLib.mbd" msaFilename="${MODULE_DIR}\BasePeCoffLib.msa"/>

+      <GenBuild baseName="BasePeCoffLib" mbdFilename="${MODULE_DIR}/BasePeCoffLib.mbd" msaFilename="${MODULE_DIR}/BasePeCoffLib.msa"/>

    </target>

    <target depends="BasePeCoffLib_clean" name="clean"/>

    <target depends="BasePeCoffLib_cleanall" name="cleanall"/>

    <target name="BasePeCoffLib_clean">

-      <OutputDirSetup baseName="BasePeCoffLib" mbdFilename="${MODULE_DIR}\BasePeCoffLib.mbd" msaFilename="${MODULE_DIR}\BasePeCoffLib.msa"/>

+      <OutputDirSetup baseName="BasePeCoffLib" mbdFilename="${MODULE_DIR}/BasePeCoffLib.mbd" msaFilename="${MODULE_DIR}/BasePeCoffLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePeCoffLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePeCoffLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePeCoffLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePeCoffLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BasePeCoffLib_cleanall">

-      <OutputDirSetup baseName="BasePeCoffLib" mbdFilename="${MODULE_DIR}\BasePeCoffLib.mbd" msaFilename="${MODULE_DIR}\BasePeCoffLib.msa"/>

+      <OutputDirSetup baseName="BasePeCoffLib" mbdFilename="${MODULE_DIR}/BasePeCoffLib.mbd" msaFilename="${MODULE_DIR}/BasePeCoffLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePeCoffLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePeCoffLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePeCoffLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePeCoffLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BasePerformanceLibNull/build.xml b/MdePkg/Library/BasePerformanceLibNull/build.xml
index aec9654740..ffb68031b5 100644
--- a/MdePkg/Library/BasePerformanceLibNull/build.xml
+++ b/MdePkg/Library/BasePerformanceLibNull/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BasePerformanceLibNull"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BasePerformanceLibNull"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BasePerformanceLibNull">

-      <GenBuild baseName="BasePerformanceLibNull" mbdFilename="${MODULE_DIR}\BasePerformanceLibNull.mbd" msaFilename="${MODULE_DIR}\BasePerformanceLibNull.msa"/>

+      <GenBuild baseName="BasePerformanceLibNull" mbdFilename="${MODULE_DIR}/BasePerformanceLibNull.mbd" msaFilename="${MODULE_DIR}/BasePerformanceLibNull.msa"/>

    </target>

    <target depends="BasePerformanceLibNull_clean" name="clean"/>

    <target depends="BasePerformanceLibNull_cleanall" name="cleanall"/>

    <target name="BasePerformanceLibNull_clean">

-      <OutputDirSetup baseName="BasePerformanceLibNull" mbdFilename="${MODULE_DIR}\BasePerformanceLibNull.mbd" msaFilename="${MODULE_DIR}\BasePerformanceLibNull.msa"/>

+      <OutputDirSetup baseName="BasePerformanceLibNull" mbdFilename="${MODULE_DIR}/BasePerformanceLibNull.mbd" msaFilename="${MODULE_DIR}/BasePerformanceLibNull.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePerformanceLibNull_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePerformanceLibNull_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePerformanceLibNull_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePerformanceLibNull_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BasePerformanceLibNull_cleanall">

-      <OutputDirSetup baseName="BasePerformanceLibNull" mbdFilename="${MODULE_DIR}\BasePerformanceLibNull.mbd" msaFilename="${MODULE_DIR}\BasePerformanceLibNull.msa"/>

+      <OutputDirSetup baseName="BasePerformanceLibNull" mbdFilename="${MODULE_DIR}/BasePerformanceLibNull.mbd" msaFilename="${MODULE_DIR}/BasePerformanceLibNull.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePerformanceLibNull_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePerformanceLibNull_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePerformanceLibNull_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePerformanceLibNull_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BasePrintLib/build.xml b/MdePkg/Library/BasePrintLib/build.xml
index 66f9c88641..76cac3fa3a 100644
--- a/MdePkg/Library/BasePrintLib/build.xml
+++ b/MdePkg/Library/BasePrintLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BasePrintLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BasePrintLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BasePrintLib">

-      <GenBuild baseName="BasePrintLib" mbdFilename="${MODULE_DIR}\BasePrintLib.mbd" msaFilename="${MODULE_DIR}\BasePrintLib.msa"/>

+      <GenBuild baseName="BasePrintLib" mbdFilename="${MODULE_DIR}/BasePrintLib.mbd" msaFilename="${MODULE_DIR}/BasePrintLib.msa"/>

    </target>

    <target depends="BasePrintLib_clean" name="clean"/>

    <target depends="BasePrintLib_cleanall" name="cleanall"/>

    <target name="BasePrintLib_clean">

-      <OutputDirSetup baseName="BasePrintLib" mbdFilename="${MODULE_DIR}\BasePrintLib.mbd" msaFilename="${MODULE_DIR}\BasePrintLib.msa"/>

+      <OutputDirSetup baseName="BasePrintLib" mbdFilename="${MODULE_DIR}/BasePrintLib.mbd" msaFilename="${MODULE_DIR}/BasePrintLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePrintLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePrintLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePrintLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePrintLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BasePrintLib_cleanall">

-      <OutputDirSetup baseName="BasePrintLib" mbdFilename="${MODULE_DIR}\BasePrintLib.mbd" msaFilename="${MODULE_DIR}\BasePrintLib.msa"/>

+      <OutputDirSetup baseName="BasePrintLib" mbdFilename="${MODULE_DIR}/BasePrintLib.mbd" msaFilename="${MODULE_DIR}/BasePrintLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BasePrintLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BasePrintLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BasePrintLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BasePrintLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseReportStatusCodeLibNull/build.xml b/MdePkg/Library/BaseReportStatusCodeLibNull/build.xml
index 1ef3f9766f..4c6822dded 100644
--- a/MdePkg/Library/BaseReportStatusCodeLibNull/build.xml
+++ b/MdePkg/Library/BaseReportStatusCodeLibNull/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseReportStatusCodeLibNull"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseReportStatusCodeLibNull"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseReportStatusCodeLibNull">

-      <GenBuild baseName="BaseReportStatusCodeLibNull" mbdFilename="${MODULE_DIR}\BaseReportStatusCodeLibNull.mbd" msaFilename="${MODULE_DIR}\BaseReportStatusCodeLibNull.msa"/>

+      <GenBuild baseName="BaseReportStatusCodeLibNull" mbdFilename="${MODULE_DIR}/BaseReportStatusCodeLibNull.mbd" msaFilename="${MODULE_DIR}/BaseReportStatusCodeLibNull.msa"/>

    </target>

    <target depends="BaseReportStatusCodeLibNull_clean" name="clean"/>

    <target depends="BaseReportStatusCodeLibNull_cleanall" name="cleanall"/>

    <target name="BaseReportStatusCodeLibNull_clean">

-      <OutputDirSetup baseName="BaseReportStatusCodeLibNull" mbdFilename="${MODULE_DIR}\BaseReportStatusCodeLibNull.mbd" msaFilename="${MODULE_DIR}\BaseReportStatusCodeLibNull.msa"/>

+      <OutputDirSetup baseName="BaseReportStatusCodeLibNull" mbdFilename="${MODULE_DIR}/BaseReportStatusCodeLibNull.mbd" msaFilename="${MODULE_DIR}/BaseReportStatusCodeLibNull.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseReportStatusCodeLibNull_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseReportStatusCodeLibNull_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseReportStatusCodeLibNull_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseReportStatusCodeLibNull_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseReportStatusCodeLibNull_cleanall">

-      <OutputDirSetup baseName="BaseReportStatusCodeLibNull" mbdFilename="${MODULE_DIR}\BaseReportStatusCodeLibNull.mbd" msaFilename="${MODULE_DIR}\BaseReportStatusCodeLibNull.msa"/>

+      <OutputDirSetup baseName="BaseReportStatusCodeLibNull" mbdFilename="${MODULE_DIR}/BaseReportStatusCodeLibNull.mbd" msaFilename="${MODULE_DIR}/BaseReportStatusCodeLibNull.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseReportStatusCodeLibNull_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseReportStatusCodeLibNull_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseReportStatusCodeLibNull_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseReportStatusCodeLibNull_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseSmbusLib/build.xml b/MdePkg/Library/BaseSmbusLib/build.xml
index 95dfe52bd3..803f646509 100644
--- a/MdePkg/Library/BaseSmbusLib/build.xml
+++ b/MdePkg/Library/BaseSmbusLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseSmbusLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseSmbusLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseSmbusLib">

-      <GenBuild baseName="BaseSmbusLib" mbdFilename="${MODULE_DIR}\BaseSmbusLib.mbd" msaFilename="${MODULE_DIR}\BaseSmbusLib.msa"/>

+      <GenBuild baseName="BaseSmbusLib" mbdFilename="${MODULE_DIR}/BaseSmbusLib.mbd" msaFilename="${MODULE_DIR}/BaseSmbusLib.msa"/>

    </target>

    <target depends="BaseSmbusLib_clean" name="clean"/>

    <target depends="BaseSmbusLib_cleanall" name="cleanall"/>

    <target name="BaseSmbusLib_clean">

-      <OutputDirSetup baseName="BaseSmbusLib" mbdFilename="${MODULE_DIR}\BaseSmbusLib.mbd" msaFilename="${MODULE_DIR}\BaseSmbusLib.msa"/>

+      <OutputDirSetup baseName="BaseSmbusLib" mbdFilename="${MODULE_DIR}/BaseSmbusLib.mbd" msaFilename="${MODULE_DIR}/BaseSmbusLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseSmbusLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseSmbusLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseSmbusLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseSmbusLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseSmbusLib_cleanall">

-      <OutputDirSetup baseName="BaseSmbusLib" mbdFilename="${MODULE_DIR}\BaseSmbusLib.mbd" msaFilename="${MODULE_DIR}\BaseSmbusLib.msa"/>

+      <OutputDirSetup baseName="BaseSmbusLib" mbdFilename="${MODULE_DIR}/BaseSmbusLib.mbd" msaFilename="${MODULE_DIR}/BaseSmbusLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseSmbusLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseSmbusLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseSmbusLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseSmbusLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa b/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
index 7d83751219..1ba0dc1007 100644
--- a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
+++ b/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
@@ -45,9 +45,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Filename>x86TimerLib.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\CallPalProc.s</Filename>

-      <Filename>Ipf\ReadItc.s</Filename>

-      <Filename>Ipf\IpfTimerLib.c</Filename>

+      <Filename>Ipf/CallPalProc.s</Filename>

+      <Filename>Ipf/ReadItc.s</Filename>

+      <Filename>Ipf/IpfTimerLib.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/MdePkg/Library/BaseTimerLibLocalApic/build.xml b/MdePkg/Library/BaseTimerLibLocalApic/build.xml
index 2d3be90bed..1d6cc6b60c 100644
--- a/MdePkg/Library/BaseTimerLibLocalApic/build.xml
+++ b/MdePkg/Library/BaseTimerLibLocalApic/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseTimerLibLocalApic"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseTimerLibLocalApic"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseTimerLibLocalApic">

-      <GenBuild baseName="BaseTimerLibLocalApic" mbdFilename="${MODULE_DIR}\BaseTimerLibLocalApic.mbd" msaFilename="${MODULE_DIR}\BaseTimerLibLocalApic.msa"/>

+      <GenBuild baseName="BaseTimerLibLocalApic" mbdFilename="${MODULE_DIR}/BaseTimerLibLocalApic.mbd" msaFilename="${MODULE_DIR}/BaseTimerLibLocalApic.msa"/>

    </target>

    <target depends="BaseTimerLibLocalApic_clean" name="clean"/>

    <target depends="BaseTimerLibLocalApic_cleanall" name="cleanall"/>

    <target name="BaseTimerLibLocalApic_clean">

-      <OutputDirSetup baseName="BaseTimerLibLocalApic" mbdFilename="${MODULE_DIR}\BaseTimerLibLocalApic.mbd" msaFilename="${MODULE_DIR}\BaseTimerLibLocalApic.msa"/>

+      <OutputDirSetup baseName="BaseTimerLibLocalApic" mbdFilename="${MODULE_DIR}/BaseTimerLibLocalApic.mbd" msaFilename="${MODULE_DIR}/BaseTimerLibLocalApic.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseTimerLibLocalApic_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseTimerLibLocalApic_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseTimerLibLocalApic_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseTimerLibLocalApic_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseTimerLibLocalApic_cleanall">

-      <OutputDirSetup baseName="BaseTimerLibLocalApic" mbdFilename="${MODULE_DIR}\BaseTimerLibLocalApic.mbd" msaFilename="${MODULE_DIR}\BaseTimerLibLocalApic.msa"/>

+      <OutputDirSetup baseName="BaseTimerLibLocalApic" mbdFilename="${MODULE_DIR}/BaseTimerLibLocalApic.mbd" msaFilename="${MODULE_DIR}/BaseTimerLibLocalApic.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseTimerLibLocalApic_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseTimerLibLocalApic_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseTimerLibLocalApic_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseTimerLibLocalApic_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/BaseUefiDecompressLib/build.xml b/MdePkg/Library/BaseUefiDecompressLib/build.xml
index e41fcf9114..fffaca033d 100644
--- a/MdePkg/Library/BaseUefiDecompressLib/build.xml
+++ b/MdePkg/Library/BaseUefiDecompressLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\BaseUefiDecompressLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/BaseUefiDecompressLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="BaseUefiDecompressLib">

-      <GenBuild baseName="BaseUefiDecompressLib" mbdFilename="${MODULE_DIR}\BaseUefiDecompressLib.mbd" msaFilename="${MODULE_DIR}\BaseUefiDecompressLib.msa"/>

+      <GenBuild baseName="BaseUefiDecompressLib" mbdFilename="${MODULE_DIR}/BaseUefiDecompressLib.mbd" msaFilename="${MODULE_DIR}/BaseUefiDecompressLib.msa"/>

    </target>

    <target depends="BaseUefiDecompressLib_clean" name="clean"/>

    <target depends="BaseUefiDecompressLib_cleanall" name="cleanall"/>

    <target name="BaseUefiDecompressLib_clean">

-      <OutputDirSetup baseName="BaseUefiDecompressLib" mbdFilename="${MODULE_DIR}\BaseUefiDecompressLib.mbd" msaFilename="${MODULE_DIR}\BaseUefiDecompressLib.msa"/>

+      <OutputDirSetup baseName="BaseUefiDecompressLib" mbdFilename="${MODULE_DIR}/BaseUefiDecompressLib.mbd" msaFilename="${MODULE_DIR}/BaseUefiDecompressLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseUefiDecompressLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseUefiDecompressLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseUefiDecompressLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseUefiDecompressLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="BaseUefiDecompressLib_cleanall">

-      <OutputDirSetup baseName="BaseUefiDecompressLib" mbdFilename="${MODULE_DIR}\BaseUefiDecompressLib.mbd" msaFilename="${MODULE_DIR}\BaseUefiDecompressLib.msa"/>

+      <OutputDirSetup baseName="BaseUefiDecompressLib" mbdFilename="${MODULE_DIR}/BaseUefiDecompressLib.mbd" msaFilename="${MODULE_DIR}/BaseUefiDecompressLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\BaseUefiDecompressLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/BaseUefiDecompressLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\BaseUefiDecompressLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/BaseUefiDecompressLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/DxeCoreEntryPoint/build.xml b/MdePkg/Library/DxeCoreEntryPoint/build.xml
index 9980656298..2d58241562 100644
--- a/MdePkg/Library/DxeCoreEntryPoint/build.xml
+++ b/MdePkg/Library/DxeCoreEntryPoint/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeCoreEntryPoint"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeCoreEntryPoint"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeCoreEntryPoint">

-      <GenBuild baseName="DxeCoreEntryPoint" mbdFilename="${MODULE_DIR}\DxeCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}\DxeCoreEntryPoint.msa"/>

+      <GenBuild baseName="DxeCoreEntryPoint" mbdFilename="${MODULE_DIR}/DxeCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}/DxeCoreEntryPoint.msa"/>

    </target>

    <target depends="DxeCoreEntryPoint_clean" name="clean"/>

    <target depends="DxeCoreEntryPoint_cleanall" name="cleanall"/>

    <target name="DxeCoreEntryPoint_clean">

-      <OutputDirSetup baseName="DxeCoreEntryPoint" mbdFilename="${MODULE_DIR}\DxeCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}\DxeCoreEntryPoint.msa"/>

+      <OutputDirSetup baseName="DxeCoreEntryPoint" mbdFilename="${MODULE_DIR}/DxeCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}/DxeCoreEntryPoint.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCoreEntryPoint_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCoreEntryPoint_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCoreEntryPoint_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreEntryPoint_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeCoreEntryPoint_cleanall">

-      <OutputDirSetup baseName="DxeCoreEntryPoint" mbdFilename="${MODULE_DIR}\DxeCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}\DxeCoreEntryPoint.msa"/>

+      <OutputDirSetup baseName="DxeCoreEntryPoint" mbdFilename="${MODULE_DIR}/DxeCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}/DxeCoreEntryPoint.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCoreEntryPoint_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCoreEntryPoint_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCoreEntryPoint_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreEntryPoint_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/DxeCoreHobLib/build.xml b/MdePkg/Library/DxeCoreHobLib/build.xml
index 9ef95dc421..acd833b42a 100644
--- a/MdePkg/Library/DxeCoreHobLib/build.xml
+++ b/MdePkg/Library/DxeCoreHobLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeCoreHobLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeCoreHobLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeCoreHobLib">

-      <GenBuild baseName="DxeCoreHobLib" mbdFilename="${MODULE_DIR}\DxeCoreHobLib.mbd" msaFilename="${MODULE_DIR}\DxeCoreHobLib.msa"/>

+      <GenBuild baseName="DxeCoreHobLib" mbdFilename="${MODULE_DIR}/DxeCoreHobLib.mbd" msaFilename="${MODULE_DIR}/DxeCoreHobLib.msa"/>

    </target>

    <target depends="DxeCoreHobLib_clean" name="clean"/>

    <target depends="DxeCoreHobLib_cleanall" name="cleanall"/>

    <target name="DxeCoreHobLib_clean">

-      <OutputDirSetup baseName="DxeCoreHobLib" mbdFilename="${MODULE_DIR}\DxeCoreHobLib.mbd" msaFilename="${MODULE_DIR}\DxeCoreHobLib.msa"/>

+      <OutputDirSetup baseName="DxeCoreHobLib" mbdFilename="${MODULE_DIR}/DxeCoreHobLib.mbd" msaFilename="${MODULE_DIR}/DxeCoreHobLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCoreHobLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCoreHobLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCoreHobLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreHobLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeCoreHobLib_cleanall">

-      <OutputDirSetup baseName="DxeCoreHobLib" mbdFilename="${MODULE_DIR}\DxeCoreHobLib.mbd" msaFilename="${MODULE_DIR}\DxeCoreHobLib.msa"/>

+      <OutputDirSetup baseName="DxeCoreHobLib" mbdFilename="${MODULE_DIR}/DxeCoreHobLib.mbd" msaFilename="${MODULE_DIR}/DxeCoreHobLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeCoreHobLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeCoreHobLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeCoreHobLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreHobLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/DxeHobLib/build.xml b/MdePkg/Library/DxeHobLib/build.xml
index 1def5e77b7..06e4e80b11 100644
--- a/MdePkg/Library/DxeHobLib/build.xml
+++ b/MdePkg/Library/DxeHobLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeHobLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeHobLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeHobLib">

-      <GenBuild baseName="DxeHobLib" mbdFilename="${MODULE_DIR}\DxeHobLib.mbd" msaFilename="${MODULE_DIR}\DxeHobLib.msa"/>

+      <GenBuild baseName="DxeHobLib" mbdFilename="${MODULE_DIR}/DxeHobLib.mbd" msaFilename="${MODULE_DIR}/DxeHobLib.msa"/>

    </target>

    <target depends="DxeHobLib_clean" name="clean"/>

    <target depends="DxeHobLib_cleanall" name="cleanall"/>

    <target name="DxeHobLib_clean">

-      <OutputDirSetup baseName="DxeHobLib" mbdFilename="${MODULE_DIR}\DxeHobLib.mbd" msaFilename="${MODULE_DIR}\DxeHobLib.msa"/>

+      <OutputDirSetup baseName="DxeHobLib" mbdFilename="${MODULE_DIR}/DxeHobLib.mbd" msaFilename="${MODULE_DIR}/DxeHobLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeHobLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeHobLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeHobLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeHobLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeHobLib_cleanall">

-      <OutputDirSetup baseName="DxeHobLib" mbdFilename="${MODULE_DIR}\DxeHobLib.mbd" msaFilename="${MODULE_DIR}\DxeHobLib.msa"/>

+      <OutputDirSetup baseName="DxeHobLib" mbdFilename="${MODULE_DIR}/DxeHobLib.mbd" msaFilename="${MODULE_DIR}/DxeHobLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeHobLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeHobLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeHobLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeHobLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/DxeIoLibCpuIo/build.xml b/MdePkg/Library/DxeIoLibCpuIo/build.xml
index 94dbb4a139..4c7243ce16 100644
--- a/MdePkg/Library/DxeIoLibCpuIo/build.xml
+++ b/MdePkg/Library/DxeIoLibCpuIo/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeIoLibCpuIo"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeIoLibCpuIo"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeIoLibCpuIo">

-      <GenBuild baseName="DxeIoLibCpuIo" mbdFilename="${MODULE_DIR}\DxeIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}\DxeIoLibCpuIo.msa"/>

+      <GenBuild baseName="DxeIoLibCpuIo" mbdFilename="${MODULE_DIR}/DxeIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}/DxeIoLibCpuIo.msa"/>

    </target>

    <target depends="DxeIoLibCpuIo_clean" name="clean"/>

    <target depends="DxeIoLibCpuIo_cleanall" name="cleanall"/>

    <target name="DxeIoLibCpuIo_clean">

-      <OutputDirSetup baseName="DxeIoLibCpuIo" mbdFilename="${MODULE_DIR}\DxeIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}\DxeIoLibCpuIo.msa"/>

+      <OutputDirSetup baseName="DxeIoLibCpuIo" mbdFilename="${MODULE_DIR}/DxeIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}/DxeIoLibCpuIo.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeIoLibCpuIo_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeIoLibCpuIo_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeIoLibCpuIo_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeIoLibCpuIo_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeIoLibCpuIo_cleanall">

-      <OutputDirSetup baseName="DxeIoLibCpuIo" mbdFilename="${MODULE_DIR}\DxeIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}\DxeIoLibCpuIo.msa"/>

+      <OutputDirSetup baseName="DxeIoLibCpuIo" mbdFilename="${MODULE_DIR}/DxeIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}/DxeIoLibCpuIo.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeIoLibCpuIo_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeIoLibCpuIo_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeIoLibCpuIo_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeIoLibCpuIo_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/DxeMemoryAllocationLib/build.xml b/MdePkg/Library/DxeMemoryAllocationLib/build.xml
index cabeb3b28b..0cbff3886c 100644
--- a/MdePkg/Library/DxeMemoryAllocationLib/build.xml
+++ b/MdePkg/Library/DxeMemoryAllocationLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeMemoryAllocationLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeMemoryAllocationLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeMemoryAllocationLib">

-      <GenBuild baseName="DxeMemoryAllocationLib" mbdFilename="${MODULE_DIR}\DxeMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}\DxeMemoryAllocationLib.msa"/>

+      <GenBuild baseName="DxeMemoryAllocationLib" mbdFilename="${MODULE_DIR}/DxeMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}/DxeMemoryAllocationLib.msa"/>

    </target>

    <target depends="DxeMemoryAllocationLib_clean" name="clean"/>

    <target depends="DxeMemoryAllocationLib_cleanall" name="cleanall"/>

    <target name="DxeMemoryAllocationLib_clean">

-      <OutputDirSetup baseName="DxeMemoryAllocationLib" mbdFilename="${MODULE_DIR}\DxeMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}\DxeMemoryAllocationLib.msa"/>

+      <OutputDirSetup baseName="DxeMemoryAllocationLib" mbdFilename="${MODULE_DIR}/DxeMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}/DxeMemoryAllocationLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeMemoryAllocationLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeMemoryAllocationLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeMemoryAllocationLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeMemoryAllocationLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeMemoryAllocationLib_cleanall">

-      <OutputDirSetup baseName="DxeMemoryAllocationLib" mbdFilename="${MODULE_DIR}\DxeMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}\DxeMemoryAllocationLib.msa"/>

+      <OutputDirSetup baseName="DxeMemoryAllocationLib" mbdFilename="${MODULE_DIR}/DxeMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}/DxeMemoryAllocationLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeMemoryAllocationLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeMemoryAllocationLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeMemoryAllocationLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeMemoryAllocationLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/DxePcdLib/build.xml b/MdePkg/Library/DxePcdLib/build.xml
index 1c5b401d63..3f502825b7 100644
--- a/MdePkg/Library/DxePcdLib/build.xml
+++ b/MdePkg/Library/DxePcdLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxePcdLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxePcdLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxePcdLib">

-      <GenBuild baseName="DxePcdLib" mbdFilename="${MODULE_DIR}\DxePcdLib.mbd" msaFilename="${MODULE_DIR}\DxePcdLib.msa"/>

+      <GenBuild baseName="DxePcdLib" mbdFilename="${MODULE_DIR}/DxePcdLib.mbd" msaFilename="${MODULE_DIR}/DxePcdLib.msa"/>

    </target>

    <target depends="DxePcdLib_clean" name="clean"/>

    <target depends="DxePcdLib_cleanall" name="cleanall"/>

    <target name="DxePcdLib_clean">

-      <OutputDirSetup baseName="DxePcdLib" mbdFilename="${MODULE_DIR}\DxePcdLib.mbd" msaFilename="${MODULE_DIR}\DxePcdLib.msa"/>

+      <OutputDirSetup baseName="DxePcdLib" mbdFilename="${MODULE_DIR}/DxePcdLib.mbd" msaFilename="${MODULE_DIR}/DxePcdLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxePcdLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxePcdLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxePcdLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxePcdLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxePcdLib_cleanall">

-      <OutputDirSetup baseName="DxePcdLib" mbdFilename="${MODULE_DIR}\DxePcdLib.mbd" msaFilename="${MODULE_DIR}\DxePcdLib.msa"/>

+      <OutputDirSetup baseName="DxePcdLib" mbdFilename="${MODULE_DIR}/DxePcdLib.mbd" msaFilename="${MODULE_DIR}/DxePcdLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxePcdLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxePcdLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxePcdLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxePcdLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/DxeReportStatusCodeLib/build.xml b/MdePkg/Library/DxeReportStatusCodeLib/build.xml
index bc4f59fc1d..fc74f9d43e 100644
--- a/MdePkg/Library/DxeReportStatusCodeLib/build.xml
+++ b/MdePkg/Library/DxeReportStatusCodeLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeReportStatusCodeLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeReportStatusCodeLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeReportStatusCodeLib">

-      <GenBuild baseName="DxeReportStatusCodeLib" mbdFilename="${MODULE_DIR}\DxeReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}\DxeReportStatusCodeLib.msa"/>

+      <GenBuild baseName="DxeReportStatusCodeLib" mbdFilename="${MODULE_DIR}/DxeReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/DxeReportStatusCodeLib.msa"/>

    </target>

    <target depends="DxeReportStatusCodeLib_clean" name="clean"/>

    <target depends="DxeReportStatusCodeLib_cleanall" name="cleanall"/>

    <target name="DxeReportStatusCodeLib_clean">

-      <OutputDirSetup baseName="DxeReportStatusCodeLib" mbdFilename="${MODULE_DIR}\DxeReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}\DxeReportStatusCodeLib.msa"/>

+      <OutputDirSetup baseName="DxeReportStatusCodeLib" mbdFilename="${MODULE_DIR}/DxeReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/DxeReportStatusCodeLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeReportStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeReportStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeReportStatusCodeLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeReportStatusCodeLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeReportStatusCodeLib_cleanall">

-      <OutputDirSetup baseName="DxeReportStatusCodeLib" mbdFilename="${MODULE_DIR}\DxeReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}\DxeReportStatusCodeLib.msa"/>

+      <OutputDirSetup baseName="DxeReportStatusCodeLib" mbdFilename="${MODULE_DIR}/DxeReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/DxeReportStatusCodeLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeReportStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeReportStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeReportStatusCodeLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeReportStatusCodeLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/DxeServicesTableLib/build.xml b/MdePkg/Library/DxeServicesTableLib/build.xml
index bf830f631e..d81cd22982 100644
--- a/MdePkg/Library/DxeServicesTableLib/build.xml
+++ b/MdePkg/Library/DxeServicesTableLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeServicesTableLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeServicesTableLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeServicesTableLib">

-      <GenBuild baseName="DxeServicesTableLib" mbdFilename="${MODULE_DIR}\DxeServicesTableLib.mbd" msaFilename="${MODULE_DIR}\DxeServicesTableLib.msa"/>

+      <GenBuild baseName="DxeServicesTableLib" mbdFilename="${MODULE_DIR}/DxeServicesTableLib.mbd" msaFilename="${MODULE_DIR}/DxeServicesTableLib.msa"/>

    </target>

    <target depends="DxeServicesTableLib_clean" name="clean"/>

    <target depends="DxeServicesTableLib_cleanall" name="cleanall"/>

    <target name="DxeServicesTableLib_clean">

-      <OutputDirSetup baseName="DxeServicesTableLib" mbdFilename="${MODULE_DIR}\DxeServicesTableLib.mbd" msaFilename="${MODULE_DIR}\DxeServicesTableLib.msa"/>

+      <OutputDirSetup baseName="DxeServicesTableLib" mbdFilename="${MODULE_DIR}/DxeServicesTableLib.mbd" msaFilename="${MODULE_DIR}/DxeServicesTableLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeServicesTableLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeServicesTableLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeServicesTableLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeServicesTableLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeServicesTableLib_cleanall">

-      <OutputDirSetup baseName="DxeServicesTableLib" mbdFilename="${MODULE_DIR}\DxeServicesTableLib.mbd" msaFilename="${MODULE_DIR}\DxeServicesTableLib.msa"/>

+      <OutputDirSetup baseName="DxeServicesTableLib" mbdFilename="${MODULE_DIR}/DxeServicesTableLib.mbd" msaFilename="${MODULE_DIR}/DxeServicesTableLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeServicesTableLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeServicesTableLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeServicesTableLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeServicesTableLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/DxeSmbusLib/build.xml b/MdePkg/Library/DxeSmbusLib/build.xml
index 2d01f3c300..7cf1273e9b 100644
--- a/MdePkg/Library/DxeSmbusLib/build.xml
+++ b/MdePkg/Library/DxeSmbusLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeSmbusLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeSmbusLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeSmbusLib">

-      <GenBuild baseName="DxeSmbusLib" mbdFilename="${MODULE_DIR}\DxeSmbusLib.mbd" msaFilename="${MODULE_DIR}\DxeSmbusLib.msa"/>

+      <GenBuild baseName="DxeSmbusLib" mbdFilename="${MODULE_DIR}/DxeSmbusLib.mbd" msaFilename="${MODULE_DIR}/DxeSmbusLib.msa"/>

    </target>

    <target depends="DxeSmbusLib_clean" name="clean"/>

    <target depends="DxeSmbusLib_cleanall" name="cleanall"/>

    <target name="DxeSmbusLib_clean">

-      <OutputDirSetup baseName="DxeSmbusLib" mbdFilename="${MODULE_DIR}\DxeSmbusLib.mbd" msaFilename="${MODULE_DIR}\DxeSmbusLib.msa"/>

+      <OutputDirSetup baseName="DxeSmbusLib" mbdFilename="${MODULE_DIR}/DxeSmbusLib.mbd" msaFilename="${MODULE_DIR}/DxeSmbusLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeSmbusLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeSmbusLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeSmbusLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeSmbusLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeSmbusLib_cleanall">

-      <OutputDirSetup baseName="DxeSmbusLib" mbdFilename="${MODULE_DIR}\DxeSmbusLib.mbd" msaFilename="${MODULE_DIR}\DxeSmbusLib.msa"/>

+      <OutputDirSetup baseName="DxeSmbusLib" mbdFilename="${MODULE_DIR}/DxeSmbusLib.mbd" msaFilename="${MODULE_DIR}/DxeSmbusLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeSmbusLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeSmbusLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeSmbusLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeSmbusLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/DxeSmmDriverEntryPoint/build.xml b/MdePkg/Library/DxeSmmDriverEntryPoint/build.xml
index 6105184eca..39a7ca4ed5 100644
--- a/MdePkg/Library/DxeSmmDriverEntryPoint/build.xml
+++ b/MdePkg/Library/DxeSmmDriverEntryPoint/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\DxeSmmDriverEntryPoint"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/DxeSmmDriverEntryPoint"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="DxeSmmDriverEntryPoint">

-      <GenBuild baseName="DxeSmmDriverEntryPoint" mbdFilename="${MODULE_DIR}\DxeSmmDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}\DxeSmmDriverEntryPoint.msa"/>

+      <GenBuild baseName="DxeSmmDriverEntryPoint" mbdFilename="${MODULE_DIR}/DxeSmmDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}/DxeSmmDriverEntryPoint.msa"/>

    </target>

    <target depends="DxeSmmDriverEntryPoint_clean" name="clean"/>

    <target depends="DxeSmmDriverEntryPoint_cleanall" name="cleanall"/>

    <target name="DxeSmmDriverEntryPoint_clean">

-      <OutputDirSetup baseName="DxeSmmDriverEntryPoint" mbdFilename="${MODULE_DIR}\DxeSmmDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}\DxeSmmDriverEntryPoint.msa"/>

+      <OutputDirSetup baseName="DxeSmmDriverEntryPoint" mbdFilename="${MODULE_DIR}/DxeSmmDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}/DxeSmmDriverEntryPoint.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeSmmDriverEntryPoint_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeSmmDriverEntryPoint_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeSmmDriverEntryPoint_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeSmmDriverEntryPoint_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="DxeSmmDriverEntryPoint_cleanall">

-      <OutputDirSetup baseName="DxeSmmDriverEntryPoint" mbdFilename="${MODULE_DIR}\DxeSmmDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}\DxeSmmDriverEntryPoint.msa"/>

+      <OutputDirSetup baseName="DxeSmmDriverEntryPoint" mbdFilename="${MODULE_DIR}/DxeSmmDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}/DxeSmmDriverEntryPoint.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\DxeSmmDriverEntryPoint_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/DxeSmmDriverEntryPoint_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\DxeSmmDriverEntryPoint_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/DxeSmmDriverEntryPoint_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/HiiLib/build.xml b/MdePkg/Library/HiiLib/build.xml
index d48a5576d8..2299e537a4 100644
--- a/MdePkg/Library/HiiLib/build.xml
+++ b/MdePkg/Library/HiiLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\HiiLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/HiiLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="HiiLib">

-      <GenBuild baseName="HiiLib" mbdFilename="${MODULE_DIR}\HiiLib.mbd" msaFilename="${MODULE_DIR}\HiiLib.msa"/>

+      <GenBuild baseName="HiiLib" mbdFilename="${MODULE_DIR}/HiiLib.mbd" msaFilename="${MODULE_DIR}/HiiLib.msa"/>

    </target>

    <target depends="HiiLib_clean" name="clean"/>

    <target depends="HiiLib_cleanall" name="cleanall"/>

    <target name="HiiLib_clean">

-      <OutputDirSetup baseName="HiiLib" mbdFilename="${MODULE_DIR}\HiiLib.mbd" msaFilename="${MODULE_DIR}\HiiLib.msa"/>

+      <OutputDirSetup baseName="HiiLib" mbdFilename="${MODULE_DIR}/HiiLib.mbd" msaFilename="${MODULE_DIR}/HiiLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\HiiLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/HiiLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\HiiLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/HiiLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="HiiLib_cleanall">

-      <OutputDirSetup baseName="HiiLib" mbdFilename="${MODULE_DIR}\HiiLib.mbd" msaFilename="${MODULE_DIR}\HiiLib.msa"/>

+      <OutputDirSetup baseName="HiiLib" mbdFilename="${MODULE_DIR}/HiiLib.mbd" msaFilename="${MODULE_DIR}/HiiLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\HiiLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/HiiLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\HiiLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/HiiLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiCoreEntryPoint/build.xml b/MdePkg/Library/PeiCoreEntryPoint/build.xml
index da71288b5b..738c43bc7a 100644
--- a/MdePkg/Library/PeiCoreEntryPoint/build.xml
+++ b/MdePkg/Library/PeiCoreEntryPoint/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiCoreEntryPoint"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiCoreEntryPoint"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiCoreEntryPoint">

-      <GenBuild baseName="PeiCoreEntryPoint" mbdFilename="${MODULE_DIR}\PeiCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}\PeiCoreEntryPoint.msa"/>

+      <GenBuild baseName="PeiCoreEntryPoint" mbdFilename="${MODULE_DIR}/PeiCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}/PeiCoreEntryPoint.msa"/>

    </target>

    <target depends="PeiCoreEntryPoint_clean" name="clean"/>

    <target depends="PeiCoreEntryPoint_cleanall" name="cleanall"/>

    <target name="PeiCoreEntryPoint_clean">

-      <OutputDirSetup baseName="PeiCoreEntryPoint" mbdFilename="${MODULE_DIR}\PeiCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}\PeiCoreEntryPoint.msa"/>

+      <OutputDirSetup baseName="PeiCoreEntryPoint" mbdFilename="${MODULE_DIR}/PeiCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}/PeiCoreEntryPoint.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiCoreEntryPoint_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiCoreEntryPoint_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiCoreEntryPoint_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiCoreEntryPoint_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiCoreEntryPoint_cleanall">

-      <OutputDirSetup baseName="PeiCoreEntryPoint" mbdFilename="${MODULE_DIR}\PeiCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}\PeiCoreEntryPoint.msa"/>

+      <OutputDirSetup baseName="PeiCoreEntryPoint" mbdFilename="${MODULE_DIR}/PeiCoreEntryPoint.mbd" msaFilename="${MODULE_DIR}/PeiCoreEntryPoint.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiCoreEntryPoint_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiCoreEntryPoint_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiCoreEntryPoint_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiCoreEntryPoint_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiCoreLib/build.xml b/MdePkg/Library/PeiCoreLib/build.xml
index 8f5e86ee84..063f68923b 100644
--- a/MdePkg/Library/PeiCoreLib/build.xml
+++ b/MdePkg/Library/PeiCoreLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiCoreLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiCoreLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiCoreLib">

-      <GenBuild baseName="PeiCoreLib" mbdFilename="${MODULE_DIR}\PeiCoreLib.mbd" msaFilename="${MODULE_DIR}\PeiCoreLib.msa"/>

+      <GenBuild baseName="PeiCoreLib" mbdFilename="${MODULE_DIR}/PeiCoreLib.mbd" msaFilename="${MODULE_DIR}/PeiCoreLib.msa"/>

    </target>

    <target depends="PeiCoreLib_clean" name="clean"/>

    <target depends="PeiCoreLib_cleanall" name="cleanall"/>

    <target name="PeiCoreLib_clean">

-      <OutputDirSetup baseName="PeiCoreLib" mbdFilename="${MODULE_DIR}\PeiCoreLib.mbd" msaFilename="${MODULE_DIR}\PeiCoreLib.msa"/>

+      <OutputDirSetup baseName="PeiCoreLib" mbdFilename="${MODULE_DIR}/PeiCoreLib.mbd" msaFilename="${MODULE_DIR}/PeiCoreLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiCoreLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiCoreLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiCoreLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiCoreLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiCoreLib_cleanall">

-      <OutputDirSetup baseName="PeiCoreLib" mbdFilename="${MODULE_DIR}\PeiCoreLib.mbd" msaFilename="${MODULE_DIR}\PeiCoreLib.msa"/>

+      <OutputDirSetup baseName="PeiCoreLib" mbdFilename="${MODULE_DIR}/PeiCoreLib.mbd" msaFilename="${MODULE_DIR}/PeiCoreLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiCoreLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiCoreLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiCoreLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiCoreLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiHobLib/build.xml b/MdePkg/Library/PeiHobLib/build.xml
index b230593d28..7374180056 100644
--- a/MdePkg/Library/PeiHobLib/build.xml
+++ b/MdePkg/Library/PeiHobLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiHobLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiHobLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiHobLib">

-      <GenBuild baseName="PeiHobLib" mbdFilename="${MODULE_DIR}\PeiHobLib.mbd" msaFilename="${MODULE_DIR}\PeiHobLib.msa"/>

+      <GenBuild baseName="PeiHobLib" mbdFilename="${MODULE_DIR}/PeiHobLib.mbd" msaFilename="${MODULE_DIR}/PeiHobLib.msa"/>

    </target>

    <target depends="PeiHobLib_clean" name="clean"/>

    <target depends="PeiHobLib_cleanall" name="cleanall"/>

    <target name="PeiHobLib_clean">

-      <OutputDirSetup baseName="PeiHobLib" mbdFilename="${MODULE_DIR}\PeiHobLib.mbd" msaFilename="${MODULE_DIR}\PeiHobLib.msa"/>

+      <OutputDirSetup baseName="PeiHobLib" mbdFilename="${MODULE_DIR}/PeiHobLib.mbd" msaFilename="${MODULE_DIR}/PeiHobLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiHobLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiHobLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiHobLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiHobLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiHobLib_cleanall">

-      <OutputDirSetup baseName="PeiHobLib" mbdFilename="${MODULE_DIR}\PeiHobLib.mbd" msaFilename="${MODULE_DIR}\PeiHobLib.msa"/>

+      <OutputDirSetup baseName="PeiHobLib" mbdFilename="${MODULE_DIR}/PeiHobLib.mbd" msaFilename="${MODULE_DIR}/PeiHobLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiHobLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiHobLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiHobLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiHobLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiIoLibCpuIo/build.xml b/MdePkg/Library/PeiIoLibCpuIo/build.xml
index 3a650ed6d4..e8f6056433 100644
--- a/MdePkg/Library/PeiIoLibCpuIo/build.xml
+++ b/MdePkg/Library/PeiIoLibCpuIo/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiIoLibCpuIo"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiIoLibCpuIo"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiIoLibCpuIo">

-      <GenBuild baseName="PeiIoLibCpuIo" mbdFilename="${MODULE_DIR}\PeiIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}\PeiIoLibCpuIo.msa"/>

+      <GenBuild baseName="PeiIoLibCpuIo" mbdFilename="${MODULE_DIR}/PeiIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}/PeiIoLibCpuIo.msa"/>

    </target>

    <target depends="PeiIoLibCpuIo_clean" name="clean"/>

    <target depends="PeiIoLibCpuIo_cleanall" name="cleanall"/>

    <target name="PeiIoLibCpuIo_clean">

-      <OutputDirSetup baseName="PeiIoLibCpuIo" mbdFilename="${MODULE_DIR}\PeiIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}\PeiIoLibCpuIo.msa"/>

+      <OutputDirSetup baseName="PeiIoLibCpuIo" mbdFilename="${MODULE_DIR}/PeiIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}/PeiIoLibCpuIo.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiIoLibCpuIo_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiIoLibCpuIo_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiIoLibCpuIo_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiIoLibCpuIo_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiIoLibCpuIo_cleanall">

-      <OutputDirSetup baseName="PeiIoLibCpuIo" mbdFilename="${MODULE_DIR}\PeiIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}\PeiIoLibCpuIo.msa"/>

+      <OutputDirSetup baseName="PeiIoLibCpuIo" mbdFilename="${MODULE_DIR}/PeiIoLibCpuIo.mbd" msaFilename="${MODULE_DIR}/PeiIoLibCpuIo.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiIoLibCpuIo_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiIoLibCpuIo_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiIoLibCpuIo_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiIoLibCpuIo_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiMemoryAllocationLib/build.xml b/MdePkg/Library/PeiMemoryAllocationLib/build.xml
index 47eff363e2..11a28fb615 100644
--- a/MdePkg/Library/PeiMemoryAllocationLib/build.xml
+++ b/MdePkg/Library/PeiMemoryAllocationLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiMemoryAllocationLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiMemoryAllocationLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiMemoryAllocationLib">

-      <GenBuild baseName="PeiMemoryAllocationLib" mbdFilename="${MODULE_DIR}\PeiMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}\PeiMemoryAllocationLib.msa"/>

+      <GenBuild baseName="PeiMemoryAllocationLib" mbdFilename="${MODULE_DIR}/PeiMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}/PeiMemoryAllocationLib.msa"/>

    </target>

    <target depends="PeiMemoryAllocationLib_clean" name="clean"/>

    <target depends="PeiMemoryAllocationLib_cleanall" name="cleanall"/>

    <target name="PeiMemoryAllocationLib_clean">

-      <OutputDirSetup baseName="PeiMemoryAllocationLib" mbdFilename="${MODULE_DIR}\PeiMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}\PeiMemoryAllocationLib.msa"/>

+      <OutputDirSetup baseName="PeiMemoryAllocationLib" mbdFilename="${MODULE_DIR}/PeiMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}/PeiMemoryAllocationLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiMemoryAllocationLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiMemoryAllocationLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiMemoryAllocationLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiMemoryAllocationLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiMemoryAllocationLib_cleanall">

-      <OutputDirSetup baseName="PeiMemoryAllocationLib" mbdFilename="${MODULE_DIR}\PeiMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}\PeiMemoryAllocationLib.msa"/>

+      <OutputDirSetup baseName="PeiMemoryAllocationLib" mbdFilename="${MODULE_DIR}/PeiMemoryAllocationLib.mbd" msaFilename="${MODULE_DIR}/PeiMemoryAllocationLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiMemoryAllocationLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiMemoryAllocationLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiMemoryAllocationLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiMemoryAllocationLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiMemoryLib/build.xml b/MdePkg/Library/PeiMemoryLib/build.xml
index f8d7bd35a4..8642382f26 100644
--- a/MdePkg/Library/PeiMemoryLib/build.xml
+++ b/MdePkg/Library/PeiMemoryLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiMemoryLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiMemoryLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiMemoryLib">

-      <GenBuild baseName="PeiMemoryLib" mbdFilename="${MODULE_DIR}\PeiMemoryLib.mbd" msaFilename="${MODULE_DIR}\PeiMemoryLib.msa"/>

+      <GenBuild baseName="PeiMemoryLib" mbdFilename="${MODULE_DIR}/PeiMemoryLib.mbd" msaFilename="${MODULE_DIR}/PeiMemoryLib.msa"/>

    </target>

    <target depends="PeiMemoryLib_clean" name="clean"/>

    <target depends="PeiMemoryLib_cleanall" name="cleanall"/>

    <target name="PeiMemoryLib_clean">

-      <OutputDirSetup baseName="PeiMemoryLib" mbdFilename="${MODULE_DIR}\PeiMemoryLib.mbd" msaFilename="${MODULE_DIR}\PeiMemoryLib.msa"/>

+      <OutputDirSetup baseName="PeiMemoryLib" mbdFilename="${MODULE_DIR}/PeiMemoryLib.mbd" msaFilename="${MODULE_DIR}/PeiMemoryLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiMemoryLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiMemoryLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiMemoryLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiMemoryLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiMemoryLib_cleanall">

-      <OutputDirSetup baseName="PeiMemoryLib" mbdFilename="${MODULE_DIR}\PeiMemoryLib.mbd" msaFilename="${MODULE_DIR}\PeiMemoryLib.msa"/>

+      <OutputDirSetup baseName="PeiMemoryLib" mbdFilename="${MODULE_DIR}/PeiMemoryLib.mbd" msaFilename="${MODULE_DIR}/PeiMemoryLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiMemoryLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiMemoryLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiMemoryLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiMemoryLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiPcdLib/build.xml b/MdePkg/Library/PeiPcdLib/build.xml
index 5e79dde43e..d2a3404152 100644
--- a/MdePkg/Library/PeiPcdLib/build.xml
+++ b/MdePkg/Library/PeiPcdLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiPcdLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiPcdLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiPcdLib">

-      <GenBuild baseName="PeiPcdLib" mbdFilename="${MODULE_DIR}\PeiPcdLib.mbd" msaFilename="${MODULE_DIR}\PeiPcdLib.msa"/>

+      <GenBuild baseName="PeiPcdLib" mbdFilename="${MODULE_DIR}/PeiPcdLib.mbd" msaFilename="${MODULE_DIR}/PeiPcdLib.msa"/>

    </target>

    <target depends="PeiPcdLib_clean" name="clean"/>

    <target depends="PeiPcdLib_cleanall" name="cleanall"/>

    <target name="PeiPcdLib_clean">

-      <OutputDirSetup baseName="PeiPcdLib" mbdFilename="${MODULE_DIR}\PeiPcdLib.mbd" msaFilename="${MODULE_DIR}\PeiPcdLib.msa"/>

+      <OutputDirSetup baseName="PeiPcdLib" mbdFilename="${MODULE_DIR}/PeiPcdLib.mbd" msaFilename="${MODULE_DIR}/PeiPcdLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiPcdLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiPcdLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiPcdLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiPcdLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiPcdLib_cleanall">

-      <OutputDirSetup baseName="PeiPcdLib" mbdFilename="${MODULE_DIR}\PeiPcdLib.mbd" msaFilename="${MODULE_DIR}\PeiPcdLib.msa"/>

+      <OutputDirSetup baseName="PeiPcdLib" mbdFilename="${MODULE_DIR}/PeiPcdLib.mbd" msaFilename="${MODULE_DIR}/PeiPcdLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiPcdLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiPcdLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiPcdLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiPcdLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiReportStatusCodeLib/build.xml b/MdePkg/Library/PeiReportStatusCodeLib/build.xml
index 53f59b1e93..1715983086 100644
--- a/MdePkg/Library/PeiReportStatusCodeLib/build.xml
+++ b/MdePkg/Library/PeiReportStatusCodeLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiReportStatusCodeLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiReportStatusCodeLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiReportStatusCodeLib">

-      <GenBuild baseName="PeiReportStatusCodeLib" mbdFilename="${MODULE_DIR}\PeiReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}\PeiReportStatusCodeLib.msa"/>

+      <GenBuild baseName="PeiReportStatusCodeLib" mbdFilename="${MODULE_DIR}/PeiReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/PeiReportStatusCodeLib.msa"/>

    </target>

    <target depends="PeiReportStatusCodeLib_clean" name="clean"/>

    <target depends="PeiReportStatusCodeLib_cleanall" name="cleanall"/>

    <target name="PeiReportStatusCodeLib_clean">

-      <OutputDirSetup baseName="PeiReportStatusCodeLib" mbdFilename="${MODULE_DIR}\PeiReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}\PeiReportStatusCodeLib.msa"/>

+      <OutputDirSetup baseName="PeiReportStatusCodeLib" mbdFilename="${MODULE_DIR}/PeiReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/PeiReportStatusCodeLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiReportStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiReportStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiReportStatusCodeLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiReportStatusCodeLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiReportStatusCodeLib_cleanall">

-      <OutputDirSetup baseName="PeiReportStatusCodeLib" mbdFilename="${MODULE_DIR}\PeiReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}\PeiReportStatusCodeLib.msa"/>

+      <OutputDirSetup baseName="PeiReportStatusCodeLib" mbdFilename="${MODULE_DIR}/PeiReportStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/PeiReportStatusCodeLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiReportStatusCodeLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiReportStatusCodeLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiReportStatusCodeLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiReportStatusCodeLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiResourcePublicationLib/build.xml b/MdePkg/Library/PeiResourcePublicationLib/build.xml
index b5ad8581e9..f7394aba38 100644
--- a/MdePkg/Library/PeiResourcePublicationLib/build.xml
+++ b/MdePkg/Library/PeiResourcePublicationLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiResourcePublicationLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiResourcePublicationLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiResourcePublicationLib">

-      <GenBuild baseName="PeiResourcePublicationLib" mbdFilename="${MODULE_DIR}\PeiResourcePublicationLib.mbd" msaFilename="${MODULE_DIR}\PeiResourcePublicationLib.msa"/>

+      <GenBuild baseName="PeiResourcePublicationLib" mbdFilename="${MODULE_DIR}/PeiResourcePublicationLib.mbd" msaFilename="${MODULE_DIR}/PeiResourcePublicationLib.msa"/>

    </target>

    <target depends="PeiResourcePublicationLib_clean" name="clean"/>

    <target depends="PeiResourcePublicationLib_cleanall" name="cleanall"/>

    <target name="PeiResourcePublicationLib_clean">

-      <OutputDirSetup baseName="PeiResourcePublicationLib" mbdFilename="${MODULE_DIR}\PeiResourcePublicationLib.mbd" msaFilename="${MODULE_DIR}\PeiResourcePublicationLib.msa"/>

+      <OutputDirSetup baseName="PeiResourcePublicationLib" mbdFilename="${MODULE_DIR}/PeiResourcePublicationLib.mbd" msaFilename="${MODULE_DIR}/PeiResourcePublicationLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiResourcePublicationLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiResourcePublicationLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiResourcePublicationLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiResourcePublicationLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiResourcePublicationLib_cleanall">

-      <OutputDirSetup baseName="PeiResourcePublicationLib" mbdFilename="${MODULE_DIR}\PeiResourcePublicationLib.mbd" msaFilename="${MODULE_DIR}\PeiResourcePublicationLib.msa"/>

+      <OutputDirSetup baseName="PeiResourcePublicationLib" mbdFilename="${MODULE_DIR}/PeiResourcePublicationLib.mbd" msaFilename="${MODULE_DIR}/PeiResourcePublicationLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiResourcePublicationLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiResourcePublicationLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiResourcePublicationLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiResourcePublicationLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiServicesTablePointerLib/build.xml b/MdePkg/Library/PeiServicesTablePointerLib/build.xml
index b3c94a87b2..f723919d78 100644
--- a/MdePkg/Library/PeiServicesTablePointerLib/build.xml
+++ b/MdePkg/Library/PeiServicesTablePointerLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiServicesTablePointerLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiServicesTablePointerLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiServicesTablePointerLib">

-      <GenBuild baseName="PeiServicesTablePointerLib" mbdFilename="${MODULE_DIR}\PeiServicesTablePointerLib.mbd" msaFilename="${MODULE_DIR}\PeiServicesTablePointerLib.msa"/>

+      <GenBuild baseName="PeiServicesTablePointerLib" mbdFilename="${MODULE_DIR}/PeiServicesTablePointerLib.mbd" msaFilename="${MODULE_DIR}/PeiServicesTablePointerLib.msa"/>

    </target>

    <target depends="PeiServicesTablePointerLib_clean" name="clean"/>

    <target depends="PeiServicesTablePointerLib_cleanall" name="cleanall"/>

    <target name="PeiServicesTablePointerLib_clean">

-      <OutputDirSetup baseName="PeiServicesTablePointerLib" mbdFilename="${MODULE_DIR}\PeiServicesTablePointerLib.mbd" msaFilename="${MODULE_DIR}\PeiServicesTablePointerLib.msa"/>

+      <OutputDirSetup baseName="PeiServicesTablePointerLib" mbdFilename="${MODULE_DIR}/PeiServicesTablePointerLib.mbd" msaFilename="${MODULE_DIR}/PeiServicesTablePointerLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiServicesTablePointerLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiServicesTablePointerLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiServicesTablePointerLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiServicesTablePointerLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiServicesTablePointerLib_cleanall">

-      <OutputDirSetup baseName="PeiServicesTablePointerLib" mbdFilename="${MODULE_DIR}\PeiServicesTablePointerLib.mbd" msaFilename="${MODULE_DIR}\PeiServicesTablePointerLib.msa"/>

+      <OutputDirSetup baseName="PeiServicesTablePointerLib" mbdFilename="${MODULE_DIR}/PeiServicesTablePointerLib.mbd" msaFilename="${MODULE_DIR}/PeiServicesTablePointerLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiServicesTablePointerLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiServicesTablePointerLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiServicesTablePointerLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiServicesTablePointerLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiServicesTablePointerLibMm7/build.xml b/MdePkg/Library/PeiServicesTablePointerLibMm7/build.xml
index af443df77c..b663224d23 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibMm7/build.xml
+++ b/MdePkg/Library/PeiServicesTablePointerLibMm7/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiServicesTablePointerLibMm7"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiServicesTablePointerLibMm7"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiServicesTablePointerLibMm7">

-      <GenBuild baseName="PeiServicesTablePointerLibMm7" mbdFilename="${MODULE_DIR}\PeiServicesTablePointerLibMm7.mbd" msaFilename="${MODULE_DIR}\PeiServicesTablePointerLibMm7.msa"/>

+      <GenBuild baseName="PeiServicesTablePointerLibMm7" mbdFilename="${MODULE_DIR}/PeiServicesTablePointerLibMm7.mbd" msaFilename="${MODULE_DIR}/PeiServicesTablePointerLibMm7.msa"/>

    </target>

    <target depends="PeiServicesTablePointerLibMm7_clean" name="clean"/>

    <target depends="PeiServicesTablePointerLibMm7_cleanall" name="cleanall"/>

    <target name="PeiServicesTablePointerLibMm7_clean">

-      <OutputDirSetup baseName="PeiServicesTablePointerLibMm7" mbdFilename="${MODULE_DIR}\PeiServicesTablePointerLibMm7.mbd" msaFilename="${MODULE_DIR}\PeiServicesTablePointerLibMm7.msa"/>

+      <OutputDirSetup baseName="PeiServicesTablePointerLibMm7" mbdFilename="${MODULE_DIR}/PeiServicesTablePointerLibMm7.mbd" msaFilename="${MODULE_DIR}/PeiServicesTablePointerLibMm7.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiServicesTablePointerLibMm7_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiServicesTablePointerLibMm7_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiServicesTablePointerLibMm7_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiServicesTablePointerLibMm7_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiServicesTablePointerLibMm7_cleanall">

-      <OutputDirSetup baseName="PeiServicesTablePointerLibMm7" mbdFilename="${MODULE_DIR}\PeiServicesTablePointerLibMm7.mbd" msaFilename="${MODULE_DIR}\PeiServicesTablePointerLibMm7.msa"/>

+      <OutputDirSetup baseName="PeiServicesTablePointerLibMm7" mbdFilename="${MODULE_DIR}/PeiServicesTablePointerLibMm7.mbd" msaFilename="${MODULE_DIR}/PeiServicesTablePointerLibMm7.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiServicesTablePointerLibMm7_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiServicesTablePointerLibMm7_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiServicesTablePointerLibMm7_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiServicesTablePointerLibMm7_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeiSmbusLib/build.xml b/MdePkg/Library/PeiSmbusLib/build.xml
index 9f1b89302d..1ab32b7f1e 100644
--- a/MdePkg/Library/PeiSmbusLib/build.xml
+++ b/MdePkg/Library/PeiSmbusLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeiSmbusLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiSmbusLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeiSmbusLib">

-      <GenBuild baseName="PeiSmbusLib" mbdFilename="${MODULE_DIR}\PeiSmbusLib.mbd" msaFilename="${MODULE_DIR}\PeiSmbusLib.msa"/>

+      <GenBuild baseName="PeiSmbusLib" mbdFilename="${MODULE_DIR}/PeiSmbusLib.mbd" msaFilename="${MODULE_DIR}/PeiSmbusLib.msa"/>

    </target>

    <target depends="PeiSmbusLib_clean" name="clean"/>

    <target depends="PeiSmbusLib_cleanall" name="cleanall"/>

    <target name="PeiSmbusLib_clean">

-      <OutputDirSetup baseName="PeiSmbusLib" mbdFilename="${MODULE_DIR}\PeiSmbusLib.mbd" msaFilename="${MODULE_DIR}\PeiSmbusLib.msa"/>

+      <OutputDirSetup baseName="PeiSmbusLib" mbdFilename="${MODULE_DIR}/PeiSmbusLib.mbd" msaFilename="${MODULE_DIR}/PeiSmbusLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiSmbusLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiSmbusLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiSmbusLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiSmbusLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeiSmbusLib_cleanall">

-      <OutputDirSetup baseName="PeiSmbusLib" mbdFilename="${MODULE_DIR}\PeiSmbusLib.mbd" msaFilename="${MODULE_DIR}\PeiSmbusLib.msa"/>

+      <OutputDirSetup baseName="PeiSmbusLib" mbdFilename="${MODULE_DIR}/PeiSmbusLib.mbd" msaFilename="${MODULE_DIR}/PeiSmbusLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeiSmbusLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeiSmbusLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeiSmbusLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiSmbusLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/PeimEntryPoint/build.xml b/MdePkg/Library/PeimEntryPoint/build.xml
index 93a821692e..ae43cb5d5b 100644
--- a/MdePkg/Library/PeimEntryPoint/build.xml
+++ b/MdePkg/Library/PeimEntryPoint/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\PeimEntryPoint"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeimEntryPoint"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PeimEntryPoint">

-      <GenBuild baseName="PeimEntryPoint" mbdFilename="${MODULE_DIR}\PeimEntryPoint.mbd" msaFilename="${MODULE_DIR}\PeimEntryPoint.msa"/>

+      <GenBuild baseName="PeimEntryPoint" mbdFilename="${MODULE_DIR}/PeimEntryPoint.mbd" msaFilename="${MODULE_DIR}/PeimEntryPoint.msa"/>

    </target>

    <target depends="PeimEntryPoint_clean" name="clean"/>

    <target depends="PeimEntryPoint_cleanall" name="cleanall"/>

    <target name="PeimEntryPoint_clean">

-      <OutputDirSetup baseName="PeimEntryPoint" mbdFilename="${MODULE_DIR}\PeimEntryPoint.mbd" msaFilename="${MODULE_DIR}\PeimEntryPoint.msa"/>

+      <OutputDirSetup baseName="PeimEntryPoint" mbdFilename="${MODULE_DIR}/PeimEntryPoint.mbd" msaFilename="${MODULE_DIR}/PeimEntryPoint.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeimEntryPoint_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeimEntryPoint_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeimEntryPoint_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeimEntryPoint_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PeimEntryPoint_cleanall">

-      <OutputDirSetup baseName="PeimEntryPoint" mbdFilename="${MODULE_DIR}\PeimEntryPoint.mbd" msaFilename="${MODULE_DIR}\PeimEntryPoint.msa"/>

+      <OutputDirSetup baseName="PeimEntryPoint" mbdFilename="${MODULE_DIR}/PeimEntryPoint.mbd" msaFilename="${MODULE_DIR}/PeimEntryPoint.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PeimEntryPoint_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PeimEntryPoint_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PeimEntryPoint_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeimEntryPoint_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/UefiBootServicesTableLib/build.xml b/MdePkg/Library/UefiBootServicesTableLib/build.xml
index c9f9fc980d..51f52ecad2 100644
--- a/MdePkg/Library/UefiBootServicesTableLib/build.xml
+++ b/MdePkg/Library/UefiBootServicesTableLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\UefiBootServicesTableLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/UefiBootServicesTableLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UefiBootServicesTableLib">

-      <GenBuild baseName="UefiBootServicesTableLib" mbdFilename="${MODULE_DIR}\UefiBootServicesTableLib.mbd" msaFilename="${MODULE_DIR}\UefiBootServicesTableLib.msa"/>

+      <GenBuild baseName="UefiBootServicesTableLib" mbdFilename="${MODULE_DIR}/UefiBootServicesTableLib.mbd" msaFilename="${MODULE_DIR}/UefiBootServicesTableLib.msa"/>

    </target>

    <target depends="UefiBootServicesTableLib_clean" name="clean"/>

    <target depends="UefiBootServicesTableLib_cleanall" name="cleanall"/>

    <target name="UefiBootServicesTableLib_clean">

-      <OutputDirSetup baseName="UefiBootServicesTableLib" mbdFilename="${MODULE_DIR}\UefiBootServicesTableLib.mbd" msaFilename="${MODULE_DIR}\UefiBootServicesTableLib.msa"/>

+      <OutputDirSetup baseName="UefiBootServicesTableLib" mbdFilename="${MODULE_DIR}/UefiBootServicesTableLib.mbd" msaFilename="${MODULE_DIR}/UefiBootServicesTableLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiBootServicesTableLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiBootServicesTableLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiBootServicesTableLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiBootServicesTableLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UefiBootServicesTableLib_cleanall">

-      <OutputDirSetup baseName="UefiBootServicesTableLib" mbdFilename="${MODULE_DIR}\UefiBootServicesTableLib.mbd" msaFilename="${MODULE_DIR}\UefiBootServicesTableLib.msa"/>

+      <OutputDirSetup baseName="UefiBootServicesTableLib" mbdFilename="${MODULE_DIR}/UefiBootServicesTableLib.mbd" msaFilename="${MODULE_DIR}/UefiBootServicesTableLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiBootServicesTableLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiBootServicesTableLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiBootServicesTableLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiBootServicesTableLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/UefiDebugLibConOut/build.xml b/MdePkg/Library/UefiDebugLibConOut/build.xml
index b314b5fffe..e70683ca7d 100644
--- a/MdePkg/Library/UefiDebugLibConOut/build.xml
+++ b/MdePkg/Library/UefiDebugLibConOut/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\UefiDebugLibConOut"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/UefiDebugLibConOut"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UefiDebugLibConOut">

-      <GenBuild baseName="UefiDebugLibConOut" mbdFilename="${MODULE_DIR}\UefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}\UefiDebugLibConOut.msa"/>

+      <GenBuild baseName="UefiDebugLibConOut" mbdFilename="${MODULE_DIR}/UefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}/UefiDebugLibConOut.msa"/>

    </target>

    <target depends="UefiDebugLibConOut_clean" name="clean"/>

    <target depends="UefiDebugLibConOut_cleanall" name="cleanall"/>

    <target name="UefiDebugLibConOut_clean">

-      <OutputDirSetup baseName="UefiDebugLibConOut" mbdFilename="${MODULE_DIR}\UefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}\UefiDebugLibConOut.msa"/>

+      <OutputDirSetup baseName="UefiDebugLibConOut" mbdFilename="${MODULE_DIR}/UefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}/UefiDebugLibConOut.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDebugLibConOut_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDebugLibConOut_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDebugLibConOut_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDebugLibConOut_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UefiDebugLibConOut_cleanall">

-      <OutputDirSetup baseName="UefiDebugLibConOut" mbdFilename="${MODULE_DIR}\UefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}\UefiDebugLibConOut.msa"/>

+      <OutputDirSetup baseName="UefiDebugLibConOut" mbdFilename="${MODULE_DIR}/UefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}/UefiDebugLibConOut.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDebugLibConOut_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDebugLibConOut_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDebugLibConOut_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDebugLibConOut_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/UefiDebugLibStdErr/build.xml b/MdePkg/Library/UefiDebugLibStdErr/build.xml
index c7449e3d75..f3c02f01b3 100644
--- a/MdePkg/Library/UefiDebugLibStdErr/build.xml
+++ b/MdePkg/Library/UefiDebugLibStdErr/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\UefiDebugLibStdErr"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/UefiDebugLibStdErr"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UefiDebugLibStdErr">

-      <GenBuild baseName="UefiDebugLibStdErr" mbdFilename="${MODULE_DIR}\UefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}\UefiDebugLibStdErr.msa"/>

+      <GenBuild baseName="UefiDebugLibStdErr" mbdFilename="${MODULE_DIR}/UefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}/UefiDebugLibStdErr.msa"/>

    </target>

    <target depends="UefiDebugLibStdErr_clean" name="clean"/>

    <target depends="UefiDebugLibStdErr_cleanall" name="cleanall"/>

    <target name="UefiDebugLibStdErr_clean">

-      <OutputDirSetup baseName="UefiDebugLibStdErr" mbdFilename="${MODULE_DIR}\UefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}\UefiDebugLibStdErr.msa"/>

+      <OutputDirSetup baseName="UefiDebugLibStdErr" mbdFilename="${MODULE_DIR}/UefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}/UefiDebugLibStdErr.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDebugLibStdErr_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDebugLibStdErr_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDebugLibStdErr_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDebugLibStdErr_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UefiDebugLibStdErr_cleanall">

-      <OutputDirSetup baseName="UefiDebugLibStdErr" mbdFilename="${MODULE_DIR}\UefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}\UefiDebugLibStdErr.msa"/>

+      <OutputDirSetup baseName="UefiDebugLibStdErr" mbdFilename="${MODULE_DIR}/UefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}/UefiDebugLibStdErr.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDebugLibStdErr_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDebugLibStdErr_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDebugLibStdErr_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDebugLibStdErr_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/UefiDevicePathLib/build.xml b/MdePkg/Library/UefiDevicePathLib/build.xml
index 2234ca485f..acfbb9acad 100644
--- a/MdePkg/Library/UefiDevicePathLib/build.xml
+++ b/MdePkg/Library/UefiDevicePathLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\UefiDevicePathLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/UefiDevicePathLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UefiDevicePathLib">

-      <GenBuild baseName="UefiDevicePathLib" mbdFilename="${MODULE_DIR}\UefiDevicePathLib.mbd" msaFilename="${MODULE_DIR}\UefiDevicePathLib.msa"/>

+      <GenBuild baseName="UefiDevicePathLib" mbdFilename="${MODULE_DIR}/UefiDevicePathLib.mbd" msaFilename="${MODULE_DIR}/UefiDevicePathLib.msa"/>

    </target>

    <target depends="UefiDevicePathLib_clean" name="clean"/>

    <target depends="UefiDevicePathLib_cleanall" name="cleanall"/>

    <target name="UefiDevicePathLib_clean">

-      <OutputDirSetup baseName="UefiDevicePathLib" mbdFilename="${MODULE_DIR}\UefiDevicePathLib.mbd" msaFilename="${MODULE_DIR}\UefiDevicePathLib.msa"/>

+      <OutputDirSetup baseName="UefiDevicePathLib" mbdFilename="${MODULE_DIR}/UefiDevicePathLib.mbd" msaFilename="${MODULE_DIR}/UefiDevicePathLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDevicePathLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDevicePathLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDevicePathLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDevicePathLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UefiDevicePathLib_cleanall">

-      <OutputDirSetup baseName="UefiDevicePathLib" mbdFilename="${MODULE_DIR}\UefiDevicePathLib.mbd" msaFilename="${MODULE_DIR}\UefiDevicePathLib.msa"/>

+      <OutputDirSetup baseName="UefiDevicePathLib" mbdFilename="${MODULE_DIR}/UefiDevicePathLib.mbd" msaFilename="${MODULE_DIR}/UefiDevicePathLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDevicePathLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDevicePathLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDevicePathLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDevicePathLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/build.xml b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/build.xml
index c7d82d624a..a6b1dbb703 100644
--- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/build.xml
+++ b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\UefiDevicePathLibDevicePathProtocol"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/UefiDevicePathLibDevicePathProtocol"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UefiDevicePathLibDevicePathProtocol">

-      <GenBuild baseName="UefiDevicePathLibDevicePathProtocol" mbdFilename="${MODULE_DIR}\UefiDevicePathLibDevicePathProtocol.mbd" msaFilename="${MODULE_DIR}\UefiDevicePathLibDevicePathProtocol.msa"/>

+      <GenBuild baseName="UefiDevicePathLibDevicePathProtocol" mbdFilename="${MODULE_DIR}/UefiDevicePathLibDevicePathProtocol.mbd" msaFilename="${MODULE_DIR}/UefiDevicePathLibDevicePathProtocol.msa"/>

    </target>

    <target depends="UefiDevicePathLibDevicePathProtocol_clean" name="clean"/>

    <target depends="UefiDevicePathLibDevicePathProtocol_cleanall" name="cleanall"/>

    <target name="UefiDevicePathLibDevicePathProtocol_clean">

-      <OutputDirSetup baseName="UefiDevicePathLibDevicePathProtocol" mbdFilename="${MODULE_DIR}\UefiDevicePathLibDevicePathProtocol.mbd" msaFilename="${MODULE_DIR}\UefiDevicePathLibDevicePathProtocol.msa"/>

+      <OutputDirSetup baseName="UefiDevicePathLibDevicePathProtocol" mbdFilename="${MODULE_DIR}/UefiDevicePathLibDevicePathProtocol.mbd" msaFilename="${MODULE_DIR}/UefiDevicePathLibDevicePathProtocol.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDevicePathLibDevicePathProtocol_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDevicePathLibDevicePathProtocol_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDevicePathLibDevicePathProtocol_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDevicePathLibDevicePathProtocol_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UefiDevicePathLibDevicePathProtocol_cleanall">

-      <OutputDirSetup baseName="UefiDevicePathLibDevicePathProtocol" mbdFilename="${MODULE_DIR}\UefiDevicePathLibDevicePathProtocol.mbd" msaFilename="${MODULE_DIR}\UefiDevicePathLibDevicePathProtocol.msa"/>

+      <OutputDirSetup baseName="UefiDevicePathLibDevicePathProtocol" mbdFilename="${MODULE_DIR}/UefiDevicePathLibDevicePathProtocol.mbd" msaFilename="${MODULE_DIR}/UefiDevicePathLibDevicePathProtocol.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDevicePathLibDevicePathProtocol_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDevicePathLibDevicePathProtocol_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDevicePathLibDevicePathProtocol_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDevicePathLibDevicePathProtocol_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/UefiDriverEntryPoint/build.xml b/MdePkg/Library/UefiDriverEntryPoint/build.xml
index 8fae304134..ac6a59821f 100644
--- a/MdePkg/Library/UefiDriverEntryPoint/build.xml
+++ b/MdePkg/Library/UefiDriverEntryPoint/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\UefiDriverEntryPoint"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/UefiDriverEntryPoint"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UefiDriverEntryPoint">

-      <GenBuild baseName="UefiDriverEntryPoint" mbdFilename="${MODULE_DIR}\UefiDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}\UefiDriverEntryPoint.msa"/>

+      <GenBuild baseName="UefiDriverEntryPoint" mbdFilename="${MODULE_DIR}/UefiDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}/UefiDriverEntryPoint.msa"/>

    </target>

    <target depends="UefiDriverEntryPoint_clean" name="clean"/>

    <target depends="UefiDriverEntryPoint_cleanall" name="cleanall"/>

    <target name="UefiDriverEntryPoint_clean">

-      <OutputDirSetup baseName="UefiDriverEntryPoint" mbdFilename="${MODULE_DIR}\UefiDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}\UefiDriverEntryPoint.msa"/>

+      <OutputDirSetup baseName="UefiDriverEntryPoint" mbdFilename="${MODULE_DIR}/UefiDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}/UefiDriverEntryPoint.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDriverEntryPoint_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDriverEntryPoint_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDriverEntryPoint_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDriverEntryPoint_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UefiDriverEntryPoint_cleanall">

-      <OutputDirSetup baseName="UefiDriverEntryPoint" mbdFilename="${MODULE_DIR}\UefiDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}\UefiDriverEntryPoint.msa"/>

+      <OutputDirSetup baseName="UefiDriverEntryPoint" mbdFilename="${MODULE_DIR}/UefiDriverEntryPoint.mbd" msaFilename="${MODULE_DIR}/UefiDriverEntryPoint.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDriverEntryPoint_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDriverEntryPoint_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDriverEntryPoint_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDriverEntryPoint_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/UefiDriverModelLib/build.xml b/MdePkg/Library/UefiDriverModelLib/build.xml
index cb6b40c1a1..3210d275f3 100644
--- a/MdePkg/Library/UefiDriverModelLib/build.xml
+++ b/MdePkg/Library/UefiDriverModelLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\UefiDriverModelLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/UefiDriverModelLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UefiDriverModelLib">

-      <GenBuild baseName="UefiDriverModelLib" mbdFilename="${MODULE_DIR}\UefiDriverModelLib.mbd" msaFilename="${MODULE_DIR}\UefiDriverModelLib.msa"/>

+      <GenBuild baseName="UefiDriverModelLib" mbdFilename="${MODULE_DIR}/UefiDriverModelLib.mbd" msaFilename="${MODULE_DIR}/UefiDriverModelLib.msa"/>

    </target>

    <target depends="UefiDriverModelLib_clean" name="clean"/>

    <target depends="UefiDriverModelLib_cleanall" name="cleanall"/>

    <target name="UefiDriverModelLib_clean">

-      <OutputDirSetup baseName="UefiDriverModelLib" mbdFilename="${MODULE_DIR}\UefiDriverModelLib.mbd" msaFilename="${MODULE_DIR}\UefiDriverModelLib.msa"/>

+      <OutputDirSetup baseName="UefiDriverModelLib" mbdFilename="${MODULE_DIR}/UefiDriverModelLib.mbd" msaFilename="${MODULE_DIR}/UefiDriverModelLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDriverModelLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDriverModelLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDriverModelLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDriverModelLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UefiDriverModelLib_cleanall">

-      <OutputDirSetup baseName="UefiDriverModelLib" mbdFilename="${MODULE_DIR}\UefiDriverModelLib.mbd" msaFilename="${MODULE_DIR}\UefiDriverModelLib.msa"/>

+      <OutputDirSetup baseName="UefiDriverModelLib" mbdFilename="${MODULE_DIR}/UefiDriverModelLib.mbd" msaFilename="${MODULE_DIR}/UefiDriverModelLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiDriverModelLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiDriverModelLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiDriverModelLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiDriverModelLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/UefiLib/build.xml b/MdePkg/Library/UefiLib/build.xml
index 27def12f4f..3db4bf4452 100644
--- a/MdePkg/Library/UefiLib/build.xml
+++ b/MdePkg/Library/UefiLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\UefiLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/UefiLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UefiLib">

-      <GenBuild baseName="UefiLib" mbdFilename="${MODULE_DIR}\UefiLib.mbd" msaFilename="${MODULE_DIR}\UefiLib.msa"/>

+      <GenBuild baseName="UefiLib" mbdFilename="${MODULE_DIR}/UefiLib.mbd" msaFilename="${MODULE_DIR}/UefiLib.msa"/>

    </target>

    <target depends="UefiLib_clean" name="clean"/>

    <target depends="UefiLib_cleanall" name="cleanall"/>

    <target name="UefiLib_clean">

-      <OutputDirSetup baseName="UefiLib" mbdFilename="${MODULE_DIR}\UefiLib.mbd" msaFilename="${MODULE_DIR}\UefiLib.msa"/>

+      <OutputDirSetup baseName="UefiLib" mbdFilename="${MODULE_DIR}/UefiLib.mbd" msaFilename="${MODULE_DIR}/UefiLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UefiLib_cleanall">

-      <OutputDirSetup baseName="UefiLib" mbdFilename="${MODULE_DIR}\UefiLib.mbd" msaFilename="${MODULE_DIR}\UefiLib.msa"/>

+      <OutputDirSetup baseName="UefiLib" mbdFilename="${MODULE_DIR}/UefiLib.mbd" msaFilename="${MODULE_DIR}/UefiLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/UefiMemoryLib/build.xml b/MdePkg/Library/UefiMemoryLib/build.xml
index 02f67e706b..3c5ba2519d 100644
--- a/MdePkg/Library/UefiMemoryLib/build.xml
+++ b/MdePkg/Library/UefiMemoryLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\UefiMemoryLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/UefiMemoryLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UefiMemoryLib">

-      <GenBuild baseName="UefiMemoryLib" mbdFilename="${MODULE_DIR}\UefiMemoryLib.mbd" msaFilename="${MODULE_DIR}\UefiMemoryLib.msa"/>

+      <GenBuild baseName="UefiMemoryLib" mbdFilename="${MODULE_DIR}/UefiMemoryLib.mbd" msaFilename="${MODULE_DIR}/UefiMemoryLib.msa"/>

    </target>

    <target depends="UefiMemoryLib_clean" name="clean"/>

    <target depends="UefiMemoryLib_cleanall" name="cleanall"/>

    <target name="UefiMemoryLib_clean">

-      <OutputDirSetup baseName="UefiMemoryLib" mbdFilename="${MODULE_DIR}\UefiMemoryLib.mbd" msaFilename="${MODULE_DIR}\UefiMemoryLib.msa"/>

+      <OutputDirSetup baseName="UefiMemoryLib" mbdFilename="${MODULE_DIR}/UefiMemoryLib.mbd" msaFilename="${MODULE_DIR}/UefiMemoryLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiMemoryLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiMemoryLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiMemoryLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiMemoryLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UefiMemoryLib_cleanall">

-      <OutputDirSetup baseName="UefiMemoryLib" mbdFilename="${MODULE_DIR}\UefiMemoryLib.mbd" msaFilename="${MODULE_DIR}\UefiMemoryLib.msa"/>

+      <OutputDirSetup baseName="UefiMemoryLib" mbdFilename="${MODULE_DIR}/UefiMemoryLib.mbd" msaFilename="${MODULE_DIR}/UefiMemoryLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiMemoryLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiMemoryLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiMemoryLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiMemoryLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/Library/UefiRuntimeServicesTableLib/build.xml b/MdePkg/Library/UefiRuntimeServicesTableLib/build.xml
index 37c0cacd25..c6dbade25e 100644
--- a/MdePkg/Library/UefiRuntimeServicesTableLib/build.xml
+++ b/MdePkg/Library/UefiRuntimeServicesTableLib/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <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\UefiRuntimeServicesTableLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/UefiRuntimeServicesTableLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UefiRuntimeServicesTableLib">

-      <GenBuild baseName="UefiRuntimeServicesTableLib" mbdFilename="${MODULE_DIR}\UefiRuntimeServicesTableLib.mbd" msaFilename="${MODULE_DIR}\UefiRuntimeServicesTableLib.msa"/>

+      <GenBuild baseName="UefiRuntimeServicesTableLib" mbdFilename="${MODULE_DIR}/UefiRuntimeServicesTableLib.mbd" msaFilename="${MODULE_DIR}/UefiRuntimeServicesTableLib.msa"/>

    </target>

    <target depends="UefiRuntimeServicesTableLib_clean" name="clean"/>

    <target depends="UefiRuntimeServicesTableLib_cleanall" name="cleanall"/>

    <target name="UefiRuntimeServicesTableLib_clean">

-      <OutputDirSetup baseName="UefiRuntimeServicesTableLib" mbdFilename="${MODULE_DIR}\UefiRuntimeServicesTableLib.mbd" msaFilename="${MODULE_DIR}\UefiRuntimeServicesTableLib.msa"/>

+      <OutputDirSetup baseName="UefiRuntimeServicesTableLib" mbdFilename="${MODULE_DIR}/UefiRuntimeServicesTableLib.mbd" msaFilename="${MODULE_DIR}/UefiRuntimeServicesTableLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiRuntimeServicesTableLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiRuntimeServicesTableLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiRuntimeServicesTableLib_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiRuntimeServicesTableLib_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UefiRuntimeServicesTableLib_cleanall">

-      <OutputDirSetup baseName="UefiRuntimeServicesTableLib" mbdFilename="${MODULE_DIR}\UefiRuntimeServicesTableLib.mbd" msaFilename="${MODULE_DIR}\UefiRuntimeServicesTableLib.msa"/>

+      <OutputDirSetup baseName="UefiRuntimeServicesTableLib" mbdFilename="${MODULE_DIR}/UefiRuntimeServicesTableLib.mbd" msaFilename="${MODULE_DIR}/UefiRuntimeServicesTableLib.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UefiRuntimeServicesTableLib_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UefiRuntimeServicesTableLib_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UefiRuntimeServicesTableLib_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UefiRuntimeServicesTableLib_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/MdePkg/build.xml b/MdePkg/build.xml
index 7d78671589..fa56d0524e 100644
--- a/MdePkg/build.xml
+++ b/MdePkg/build.xml
@@ -18,10 +18,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property environment="env" />  

   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}" />

   <property name="PACKAGE" value="MdePkg" />

-  <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg" />

+  <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}/MdePkg" />

   <property name="BUILD_MODE" value="PACKAGE" />

   

-  <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml" />

+  <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml" />

   

   <target name="buildfpd" depends="init, fpdparser, builds" />

   

@@ -34,11 +34,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <fail message="WORKSPACE environmental variable not set." />

       </then>

     </if>

-    <ToolChainSetup confPath="${WORKSPACE_DIR}\Tools\Conf" />

+    <ToolChainSetup confPath="${WORKSPACE_DIR}/Tools/Conf" />

   </target>

 

   <target name="tools">

-    <ant antfile="${WORKSPACE_DIR}\Tools\Source\TianoTools\build.xml" />

+    <ant antfile="${WORKSPACE_DIR}/Tools/Source/TianoTools/build.xml" />

   </target>

   

   <target name="fpdparser" unless="FPD_File">

@@ -46,15 +46,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>

   

   <target name="builds" depends="fpdparser">

-    <ant antfile="${PACKAGE_DIR}\build.out.xml" />

+    <ant antfile="${PACKAGE_DIR}/build.out.xml" />

   </target>

   

   <!-- clean. -->

   <target name="clean" depends="init">

     <if>

-      <available file="${PACKAGE_DIR}\build.out.xml" />

+      <available file="${PACKAGE_DIR}/build.out.xml" />

       <then>

-        <ant antfile="${PACKAGE_DIR}\build.out.xml" target="clean" />

+        <ant antfile="${PACKAGE_DIR}/build.out.xml" target="clean" />

       </then>

     </if>

   </target>

@@ -62,13 +62,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!-- clean All. -->

   <target name="cleanall" depends="init">

     <if>

-      <available file="${PACKAGE_DIR}\build.out.xml" />

+      <available file="${PACKAGE_DIR}/build.out.xml" />

       <then>

-        <ant antfile="${PACKAGE_DIR}\build.out.xml" target="cleanall" />

-        <delete file="${PACKAGE_DIR}\build.out.xml" />

+        <ant antfile="${PACKAGE_DIR}/build.out.xml" target="cleanall" />

+        <delete file="${PACKAGE_DIR}/build.out.xml" />

       </then>

     </if>

-    <delete dir="${PACKAGE_DIR}\Build\FV" />

+    <delete dir="${PACKAGE_DIR}/Build/FV" />

   </target>

   

 </project>

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 9c94fb6ea6..b8d3cd5032 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -25,17 +25,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>

 

     <sequential>

-      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>

+      <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>

 

       <if>

-        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

         <then>

-          <makedeps DepsFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep">

-            <input file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

-            <input file="${DEST_DIR_DEBUG}\AutoGen.h"/>

+          <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">

+            <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

+            <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>

             <includepath path="${WORKSPACE_DIR}"/>

             <includepath path="${MODULE_DIR}"/>

-            <includepath path="${MODULE_DIR}\${ARCH}"/>

+            <includepath path="${MODULE_DIR}/${ARCH}"/>

             <EXTRA.INC/>

           </makedeps>

         </then>

@@ -43,10 +43,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

       <OnDependency>

         <sourcefiles>

-          <file ListFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep"/>

+          <file ListFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>

         </sourcefiles>

         <targetfiles>

-          <file Name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+          <file Name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

         </targetfiles>

 

         <sequential>

@@ -54,17 +54,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <command type="CC" workdir="${DEST_DIR_OUTPUT}">

               <includepath path="${WORKSPACE_DIR}"/>

               <includepath path="${MODULE_DIR}"/>

-              <includepath path="${MODULE_DIR}\${ARCH}"/>

+              <includepath path="${MODULE_DIR}/${ARCH}"/>

               <EXTRA.INC/>

 

               <argument value="${CC_FLAGS}"/>

               <EXTRA.ARG/>

-              <!-- <argument value="/FI${DEST_DIR_DEBUG}\AutoGen.h" /> -->

-              <includeFile value="${DEST_DIR_DEBUG}\AutoGen.h"/>

-              <!-- <argument value="/Fo${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> -->

-              <outputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+              <!-- <argument value="/FI${DEST_DIR_DEBUG}/AutoGen.h" /> -->

+              <includeFile value="${DEST_DIR_DEBUG}/AutoGen.h"/>

+              <!-- <argument value="/Fo${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->

+              <outputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

 

-              <fileset casesensitive="off" file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

+              <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

             </command>

           </cc>

         </sequential>

@@ -73,7 +73,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <!--

         for library generation later

         -->

-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> 

+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> 

     </sequential>

   </macrodef>

 

@@ -87,17 +87,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>

 

     <sequential>

-      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>

+      <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>

 

       <if>

-        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

         <then>

-          <makedeps DepsFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep">

-            <input file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

-            <input file="${DEST_DIR_DEBUG}\AutoGen.h"/>

+          <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">

+            <input file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

+            <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>

             <includepath path="${WORKSPACE_DIR}"/>

             <includepath path="${MODULE_DIR}"/>

-            <includepath path="${MODULE_DIR}\${ARCH}"/>

+            <includepath path="${MODULE_DIR}/${ARCH}"/>

             <EXTRA.INC/>

           </makedeps>

         </then>

@@ -105,10 +105,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

       <OnDependency>

         <sourcefiles>

-          <file ListFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep"/>

+          <file ListFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>

         </sourcefiles>

         <targetfiles>

-          <file Name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+          <file Name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

         </targetfiles>

 

         <sequential>

@@ -116,17 +116,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <command type="CC" workdir="${DEST_DIR_OUTPUT}">

               <includepath path="${WORKSPACE_DIR}"/>

               <includepath path="${MODULE_DIR}"/>

-              <includepath path="${MODULE_DIR}\${ARCH}"/>

+              <includepath path="${MODULE_DIR}/${ARCH}"/>

               <EXTRA.INC/>

     

               <argument value="${CC_FLAGS}"/>

               <EXTRA.ARG/>

-              <!-- <argument value="/FI${DEST_DIR_DEBUG}\AutoGen.h" />  -->

-              <includeFile value="${DEST_DIR_DEBUG}\AutoGen.h"/>

-              <!-- <argument value="/Fo${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> -->

-              <outputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+              <!-- <argument value="/FI${DEST_DIR_DEBUG}/AutoGen.h" />  -->

+              <includeFile value="${DEST_DIR_DEBUG}/AutoGen.h"/>

+              <!-- <argument value="/Fo${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->

+              <outputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

     

-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

+              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

             </command>

           </cc>

         </sequential>

@@ -134,7 +134,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <!--

         for library generation later

         -->

-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> 

+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> 

     </sequential>

   </macrodef>

 

@@ -147,36 +147,36 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>

 

     <sequential>

-      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>

+      <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>

 

       <OnDependency>

         <sourcefiles>

-          <file name="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_OUTPUT}\${BASE_NAME}.@{FILEEXT}.depex"/>

+          <file name="${DEST_DIR_OUTPUT}/${BASE_NAME}.@{FILEEXT}.depex"/>

         </targetfiles>

 

         <sequential>

-          <copy file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 

-                tofile="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.c"/>

+          <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 

+                tofile="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>

 

           <cc userdefine="on">

             <command type="CC" workdir=".">

               <includepath path="${DEST_DIR_DEBUG}" /> 

               <includepath path="${WORKSPACE_DIR}"/>

               <includepath path="${MODULE_DIR}"/>

-              <includepath path="${MODULE_DIR}\${ARCH}"/>

+              <includepath path="${MODULE_DIR}/${ARCH}"/>

               <EXTRA.INC/>

               <argument value="${PP_FLAGS}"/>

-              <fileset casesensitive="off" file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.c"/>

+              <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>

               <outputFile value="@{FILENAME}.@{FILEEXT}.i"/>

             </command>

           </cc>

     

-          <gendepex inputFile="@{FILENAME}.@{FILEEXT}.i" outputFile="${DEST_DIR_OUTPUT}\${BASE_NAME}.@{FILEEXT}.depex"/>

+          <gendepex inputFile="@{FILENAME}.@{FILEEXT}.i" outputFile="${DEST_DIR_OUTPUT}/${BASE_NAME}.@{FILEEXT}.depex"/>

           <delete file="@{FILENAME}.@{FILEEXT}.i" />

-          <delete file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.c" /> 

+          <delete file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c" /> 

         </sequential>

       </OnDependency>

     </sequential>

@@ -188,8 +188,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
      FILENAME="${SOURCE_NAME}"

      FILEEXT="c">

      <EXTRA.INC>

-       <includepath path="${PACKAGE_DIR}\Include"/>

-       <includepath path="${PACKAGE_DIR}\Include\${ARCH}"/>

+       <includepath path="${PACKAGE_DIR}/Include"/>

+       <includepath path="${PACKAGE_DIR}/Include/${ARCH}"/>

      </EXTRA.INC>

 

      <EXTRA.ARG>

@@ -210,14 +210,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>

 

     <sequential>

-      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>

+      <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>

 

       <OnDependency>

         <sourcefiles>

-          <file Name="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

+          <file Name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

         </sourcefiles>

         <targetfiles>

-          <file Name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+          <file Name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

         </targetfiles>

 

         <sequential>

@@ -225,15 +225,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <command type="ASM">

               <includepath path="${WORKSPACE_DIR}"/>

               <includepath path="${MODULE_DIR}"/>

-              <includepath path="${MODULE_DIR}\${ARCH}"/>

+              <includepath path="${MODULE_DIR}/${ARCH}"/>

               <EXTRA.INC/>

       

               <argument value="${ASM_FLAGS}"/>

               <EXTRA.ARG/>

-              <argument value="/Fl${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.lst"/>

-              <OutputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+              <argument value="/Fl${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.lst"/>

+              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

       

-              <fileset casesensitive="off" file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

+              <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

             </command>

           </cc>

         </sequential>

@@ -241,7 +241,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <!--

         for library generation later

         -->

-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

     </sequential>

   </macrodef>

 

@@ -263,7 +263,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <file list="${OBJECTS}"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${BIN_DIR}\@{FILENAME}.lib"/>

+          <file name="${BIN_DIR}/@{FILENAME}.lib"/>

         </targetfiles>

 

         <sequential>

@@ -273,8 +273,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <argument value="${LIB_FLAGS}"/>

               <!--<argument value="${OBJECTS}"/>-->

               <FileList dir="" files="${OBJECTS}"/>

-              <!-- <argument value="/out:${BIN_DIR}\@{FILENAME}.lib"/> -->

-              <OutputFile value="${BIN_DIR}\@{FILENAME}.lib"/>

+              <!-- <argument value="/out:${BIN_DIR}/@{FILENAME}.lib"/> -->

+              <OutputFile value="${BIN_DIR}/@{FILENAME}.lib"/>

             </command>

           </cc>

         </sequential>

@@ -294,16 +294,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>

 

     <sequential>

-      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>

+      <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>

 

       <if>

-        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

         <then>

-          <makedeps DepsFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep">

-            <input file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

+          <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">

+            <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

             <includepath path="${WORKSPACE_DIR}"/>

             <includepath path="${MODULE_DIR}"/>

-            <includepath path="${MODULE_DIR}\${ARCH}"/>

+            <includepath path="${MODULE_DIR}/${ARCH}"/>

             <EXTRA.INC/>

           </makedeps>

         </then>

@@ -311,41 +311,41 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

       <OnDependency>

         <sourcefiles>

-          <file listfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep"/>

+          <file listfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

         </targetfiles>

 

         <sequential>

-          <copy file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 

-                tofile="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.c"/>

+          <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 

+                tofile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>

           <cc userdefine="on">

             <command type="CC" workdir="."> 

               <includepath path="${WORKSPACE_DIR}"/>

               <includepath path="${MODULE_DIR}"/>

-              <includepath path="${MODULE_DIR}\${ARCH}"/>

+              <includepath path="${MODULE_DIR}/${ARCH}"/>

               <EXTRA.INC/>

               <argument value="${PP_FLAGS}"/>

-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.c"/>

+              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>

             </command>

           </cc>

           <move file="@{FILENAME}.@{FILEEXT}.i" 

-                tofile="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.pro"/>

+                tofile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.pro"/>

       

           <cc userdefine="on">

             <command type="ASM" includepathDelimiter="-I">

               <includepath path="${WORKSPACE_DIR}"/>

               <includepath path="${MODULE_DIR}"/>

-              <includepath path="${MODULE_DIR}\${ARCH}"/>

+              <includepath path="${MODULE_DIR}/${ARCH}"/>

               <EXTRA.INC/>

       

               <argument value="${ASM_FLAGS}"/>

               <EXTRA.ARG/>

-              <!-- <argument value="-o ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> -->

-              <OutputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+              <!-- <argument value="-o ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->

+              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

       

-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.pro"/>

+              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.pro"/>

             </command>

           </cc>

         </sequential>

@@ -353,7 +353,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <!--

         for library generation later

         -->

-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

     </sequential>

   </macrodef>

 

@@ -367,28 +367,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>

 

     <sequential>

-      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>

+      <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>

   

       <cc userdefine="on">

         <command type="ASM" includepathDelimiter="-I">

           <includepath path="${WORKSPACE_DIR}"/>

           <includepath path="${MODULE_DIR}"/>

-          <includepath path="${MODULE_DIR}\${ARCH}"/>

+          <includepath path="${MODULE_DIR}/${ARCH}"/>

           <EXTRA.INC/>

   

           <argument value="${ASM_FLAGS}"/>

           <EXTRA.ARG/>

-          <!-- <argument value="-o ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> -->

-          <OutputFile File="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+          <!-- <argument value="-o ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->

+          <OutputFile File="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

   

-          <fileset casesensitive="off" file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

+          <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

         </command>

       </cc>

   

       <!--

         for library generation later

         -->

-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

     </sequential>

   </macrodef>

   

@@ -421,30 +421,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>

 

     <sequential>

-      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>

+      <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>

 

       <OnDependency>

         <sourcefiles>

-          <file name="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>

         </targetfiles>

 

         <sequential>

           <strgather commandtype="parse" newdatabase="true">

-            <database name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>

+            <database name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>

             <includepath path="${WORKSPACE_DIR}"/>

             <includepath path="${MODULE_DIR}"/>

-            <includepath path="${MODULE_DIR}\${ARCH}"/>

+            <includepath path="${MODULE_DIR}/${ARCH}"/>

             <EXTRA.INC/>

             <EXTRA.ARG/>

-            <inputfile name="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

+            <inputfile name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

           </strgather>

         </sequential>

       </OnDependency>

 

-      <bl name="SDB_FILES" value="${SDB_FILES}, ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>

+      <bl name="SDB_FILES" value="${SDB_FILES}, ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>

     </sequential>

   </macrodef>

 

@@ -466,11 +466,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <file list="${SOURCE_FILES}"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>

         </targetfiles>

         

         <sequential>

-          <strgather commandtype="scan" outputdatabase="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb" verbose="read">

+          <strgather commandtype="scan" outputdatabase="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb" verbose="read">

             <skipext name=".uni"/>

             <skipext name=".h"/>

             <database list="${SDB_FILES}"/>

@@ -481,30 +481,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

       <OnDependency>

         <sourcefiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}StrDefs.h"/>

-          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.hpk"/>

-          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.c"/>

+          <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}StrDefs.h"/>

+          <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.hpk"/>

+          <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c"/>

         </targetfiles>

         

         <sequential>

           <strgather basename="@{FILENAME}Strings" commandtype="dump"

-                     outputdefines="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}StrDefs.h"

-                     outputhpk="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.hpk"

-                     outputstring="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.c">

-            <database name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>

+                     outputdefines="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}StrDefs.h"

+                     outputhpk="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.hpk"

+                     outputstring="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c">

+            <database name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>

           </strgather>

         </sequential>

       </OnDependency>

 

       <OnDependency>

         <sourcefiles>

-          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.c"/>

+          <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Strings.obj"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj"/>

         </targetfiles>

         

         <sequential>

@@ -512,18 +512,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <command type="CC" workdir="${DEST_DIR_OUTPUT}" includepathDelimiter="-I">

               <includepath path="${WORKSPACE_DIR}"/>

               <includepath path="${MODULE_DIR}"/>

-              <includepath path="${MODULE_DIR}\${ARCH}"/>

+              <includepath path="${MODULE_DIR}/${ARCH}"/>

 

               <argument value="${CC_FLAGS}"/>

-              <OutputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Strings.obj"/>

+              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj"/>

 

-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.c"/>

+              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c"/>

             </command>

           </cc>

         </sequential>

       </OnDependency>

 

-      <bl name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Strings.obj"/>

+      <bl name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj"/>

     </sequential>

   </macrodef>

 

@@ -542,14 +542,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <mkdir dir="${DEST_DIR_DEBUG}/@{FILEPATH}"/>

 

       <if>

-        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

         <then>

-          <makedeps DepsFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep">

-            <input file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

-            <!-- <input file="${DEST_DIR_DEBUG}\AutoGen.h"/> -->

+          <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">

+            <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

+            <!-- <input file="${DEST_DIR_DEBUG}/AutoGen.h"/> -->

             <includepath path="${WORKSPACE_DIR}"/>

             <includepath path="${MODULE_DIR}"/>

-            <includepath path="${MODULE_DIR}\${ARCH}"/>

+            <includepath path="${MODULE_DIR}/${ARCH}"/>

             <EXTRA.INC/>

           </makedeps>

         </then>

@@ -557,17 +557,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

       <OnDependency>

         <sourcefiles>

-          <file listfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep"/>

+          <file listfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

         </targetfiles>

 

         <sequential>

-          <vfrcompile createIfrBinFile="on" createListFile="on" outPutDir="${DEST_DIR_DEBUG}\@{FILEPATH}" vfrFile="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}">

+          <vfrcompile createIfrBinFile="on" createListFile="on" outPutDir="${DEST_DIR_DEBUG}/@{FILEPATH}" vfrFile="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}">

             <includepath path="${WORKSPACE_DIR}"/>

             <includepath path="${MODULE_DIR}"/>

-            <includepath path="${MODULE_DIR}\${ARCH}"/>

+            <includepath path="${MODULE_DIR}/${ARCH}"/>

             <EXTRA.INC/>

           </vfrcompile>

     

@@ -575,19 +575,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <command type="CC" workdir="${DEST_DIR_OUTPUT}" includepathDelimiter="-I">

               <includepath path="${WORKSPACE_DIR}"/>

               <includepath path="${MODULE_DIR}"/>

-              <includepath path="${MODULE_DIR}\${ARCH}"/>

+              <includepath path="${MODULE_DIR}/${ARCH}"/>

               <argument value="${CC_FLAGS}"/>

-              <OutputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

               <EXTRA.ARG/>

     

-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.c"/>

+              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.c"/>

             </command>

           </cc>

     

           <delete file="@{FILENAME}.i"/>

         </sequential>

       </OnDependency>

-      <bl name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>

+      <bl name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>

     </sequential>

   </macrodef>

 

@@ -612,7 +612,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <file list="${LIBS}"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.dll"/>

+          <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll"/>

         </targetfiles>

 

         <sequential>

@@ -622,9 +622,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <libset libs="${LIBS}"/>

               <LINK.ARG/>

               <EntryPoint value="_ModuleEntryPoint"/>

-              <map value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.map"/>

-              <pdb value="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.pdb"/>

-              <OutputFile value="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.dll"/>

+              <map value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.map"/>

+              <pdb value="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.pdb"/>

+              <OutputFile value="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll"/>

               <FileList dir="" files="${OBJECTS}"/>

             </command>

           </cc>

@@ -644,15 +644,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>

       <OnDependency>

         <sourcefiles>

-          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

+          <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.efi"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>

         </targetfiles>

 

         <sequential>

-          <fwimage componenttype="${COMPONENT_TYPE}" outImage="${DEST_DIR_OUTPUT}\@{FILENAME}.efi" 

-                   peImage="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" time="0"/>

+          <fwimage componenttype="${COMPONENT_TYPE}" outImage="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" 

+                   peImage="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" time="0"/>

         </sequential>

       </OnDependency>

     </sequential>

@@ -704,16 +704,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

       <OnDependency>

         <sourcefiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.efi"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.pe32"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.pe32"/>

         </targetfiles>

 

         <sequential>

-          <copy file="${DEST_DIR_OUTPUT}\@{FILENAME}.efi" tofile="${BIN_DIR}\@{FILENAME}.efi" />

-          <gensection inputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.efi" 

-                      outputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.pe32" 

+          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${BIN_DIR}/@{FILENAME}.efi" />

+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" 

+                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.pe32" 

                       sectiontype="EFI_SECTION_PE32"/>

     

           <POST.PROCESS/>

@@ -737,12 +737,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>

       <if>

         <not>

-          <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.ver"/>

+          <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ver"/>

         </not>

 

         <then>

           <PRE.PROCESS/>

-          <gensection outputfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.ver" 

+          <gensection outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ver" 

                       versionnum="@{VERSION}"

                       sectiontype="EFI_SECTION_VERSION"/>

           <POST.PROCESS/>

@@ -766,13 +766,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>

       <if>

         <not>

-          <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.ui"/>

+          <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ui"/>

         </not>

 

         <then>

           <PRE.PROCESS/>

           <gensection interfacestring="@{UI}"

-                      outputfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.ui" 

+                      outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ui" 

                       sectiontype="EFI_SECTION_USER_INTERFACE"/>

           <POST.PROCESS/>

         </then>

@@ -813,18 +813,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <PRE.PROCESS/>

 

       <if>

-        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex"/>

+        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>

         <then>

           <OnDependency>

             <sourcefiles>

-              <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex"/>

+              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>

             </sourcefiles>

             <targetfiles>

-              <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>

+              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"/>

             </targetfiles>

             <sequential>

-              <gensection inputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex" 

-                          outputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx" 

+              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex" 

+                          outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx" 

                           sectiontype="EFI_SECTION_DXE_DEPEX"/>

             </sequential>

           </OnDependency>

@@ -832,10 +832,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <else>

           <if>

             <not>

-              <available type="file" file="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>

+              <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"/>

             </not>

             <then>

-              <touch file="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>

+              <touch file="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"/>

             </then>

           </if>

         </else>

@@ -858,19 +858,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>

       <PRE.PROCESS/>

       <if>

-        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex"/>

+        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>

         <then>

           <OnDependency>

             <sourcefiles>

-              <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex"/>

+              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>

             </sourcefiles>

             <targetfiles>

-              <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>

+              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"/>

             </targetfiles>

 

             <sequential>

-              <gensection inputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex" 

-                          outputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx" 

+              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex" 

+                          outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx" 

                           sectiontype="EFI_SECTION_PEI_DEPEX"/>

             </sequential>

           </OnDependency>

@@ -879,10 +879,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <else>

           <if>

             <not>

-              <available type="file" file="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>

+              <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"/>

             </not>

             <then>

-              <touch file="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>

+              <touch file="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"/>

             </then>

           </if>

         </else>

@@ -902,8 +902,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <element name="EXTRA.ARG" optional="yes"/>

   

       <sequential>

-        <gensection inputfile="${BIN_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 

-                    outputfile="${BIN_DIR}\@{FILENAME}.pe32" 

+        <gensection inputfile="${BIN_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 

+                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" 

                     sectiontype="EFI_SECTION_PIC"/>

       </sequential>

     </macrodef>

@@ -920,8 +920,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <element name="EXTRA.ARG" optional="yes"/>

   

       <sequential>

-        <gensection inputfile="${BIN_DIR}\@{FILENAME}.@{FILEEXT}" 

-                    outputfile="${BIN_DIR}\@{FILENAME}.pe32" 

+        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" 

+                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" 

                     sectiontype="EFI_SECTION_PE32"/>

       </sequential>

     </macrodef>

@@ -941,16 +941,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>

       <OnDependency>

         <sourcefiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.sec"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"/>

         </targetfiles>

 

         <sequential>

           <PRE.PROCESS/>

-          <gensection inputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}" 

-                      outputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.sec" 

+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}" 

+                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.sec" 

                       sectiontype="EFI_SECTION_RAW"/>

           <POST.PROCESS/>

         </sequential>

@@ -969,8 +969,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <element name="EXTRA.ARG" optional="yes"/>

   

       <sequential>

-        <gensection inputfile="${BIN_DIR}\@{FILENAME}.@{FILEEXT}" 

-                    outputfile="${BIN_DIR}\@{FILENAME}.pe32" 

+        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" 

+                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" 

                     sectiontype="EFI_SECTION_PE32"/>

       </sequential>

     </macrodef>

@@ -987,8 +987,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <element name="EXTRA.ARG" optional="yes"/>

   

       <sequential>

-        <gensection inputfile="${BIN_DIR}\@{FILENAME}.@{FILEEXT}" 

-                    outputfile="${BIN_DIR}\@{FILENAME}.pe32" 

+        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" 

+                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" 

                     sectiontype="EFI_SECTION_PE32"/>

       </sequential>

     </macrodef>

@@ -1005,8 +1005,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <element name="EXTRA.ARG" optional="yes"/>

   

       <sequential>

-        <gensection inputfile="${BIN_DIR}\@{FILENAME}.@{FILEEXT}" 

-                    outputfile="${BIN_DIR}\@{FILENAME}.pe32" 

+        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" 

+                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" 

                     sectiontype="EFI_SECTION_PE32"/>

       </sequential>

     </macrodef>

@@ -1026,20 +1026,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>

       <OnDependency>

         <sourcefiles>

-          <file name="${FV_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>

+          <file name="${FV_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

         </sourcefiles>

         <targetfiles>

-          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}fv.sec"/>

+          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}fv.sec"/>

         </targetfiles>

 

         <sequential>

           <PRE.PROCESS/>

     

-          <copy file="${FV_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 

-                tofile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 

+          <copy file="${FV_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 

+                tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 

                 overwrite="true"/>

-          <gensection inputfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 

-                      outputfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}fv.sec" 

+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 

+                      outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}fv.sec" 

                       sectiontype="EFI_SECTION_FIRMWARE_VOLUME_IMAGE"/>

     

           <POST.PROCESS/>

@@ -1060,8 +1060,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>

 

     <sequential>

-      <copy file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 

-            tofile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.bin"/>

+      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 

+            tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>

     </sequential>

   </macrodef>

 

@@ -1077,9 +1077,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>

 

     <sequential>

-      <mkdir dir="${MODULE_DIR}\@{FILEPATH}" /> 

-      <copy file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 

-            tofile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.bin"/>

+      <mkdir dir="${MODULE_DIR}/@{FILEPATH}" /> 

+      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 

+            tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>

     </sequential>

   </macrodef>

   <macrodef name="Build_EFI">

@@ -1091,9 +1091,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>

 

     <sequential>

-      <mkdir dir="${MODULE_DIR}\@{FILEPATH}" /> 

-      <copy file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 

-        tofile="${DEST_DIR_OUTPUT}\${BASE_NAME}.efi"/>

+      <mkdir dir="${MODULE_DIR}/@{FILEPATH}" /> 

+      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 

+        tofile="${DEST_DIR_OUTPUT}/${BASE_NAME}.efi"/>

     </sequential>

   </macrodef>

 </project>

diff --git a/Tools/Source/TianoTools/GenCRC32Section/build.xml b/Tools/Source/TianoTools/GenCRC32Section/build.xml
index a239f983c0..cbdd04a0c8 100644
--- a/Tools/Source/TianoTools/GenCRC32Section/build.xml
+++ b/Tools/Source/TianoTools/GenCRC32Section/build.xml
@@ -67,8 +67,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <property name="ext_static" value=".lib"/>

         <property name="ext_dynamic" value=".dll"/>

         <property name="ext_exe" value=".exe"/>

-				<property name="MSVC_DIR" value="C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\Include" />

-				<property name="MSVC_SDK_DIR" value="C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Include" />

+				<property name="MSVC_DIR" value="C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/Include" />

+				<property name="MSVC_SDK_DIR" value="C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK/Include" />

 			</then>

 			<elseif>

 			  <equals arg1="${ToolChain}" arg2="gcc"/>