62 files changed, 870 insertions, 870 deletions
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}"/>