diff --git a/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.mbd b/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.mbd
similarity index 100%
rename from EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.mbd
rename to EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.mbd
diff --git a/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.msa b/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
similarity index 93%
rename from EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.msa
rename to EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
index cd131d0df3..e5feb4df33 100644
--- a/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.msa
+++ b/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
@@ -38,10 +38,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
-    <Filename>..\MonoStatusCode.c</Filename>
-    <Filename>..\MonoStatusCode.h</Filename>
+    <Filename>MonoStatusCode.dxs</Filename>
+    <Filename>MonoStatusCode.c</Filename>
     <Filename>PlatformStatusCode.c</Filename>
-    <Filename>..\MonoStatusCode.dxs</Filename>
   </SourceFiles>
   <Includes>
     <PackageName>MdePkg</PackageName>
diff --git a/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/PlatformStatusCode.c b/EdkNt32Pkg/Pei/MonoStatusCode/PlatformStatusCode.c
similarity index 95%
rename from EdkNt32Pkg/Pei/MonoStatusCode/Nt32/PlatformStatusCode.c
rename to EdkNt32Pkg/Pei/MonoStatusCode/PlatformStatusCode.c
index fcbe86465c..919ab05ee7 100644
--- a/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/PlatformStatusCode.c
+++ b/EdkNt32Pkg/Pei/MonoStatusCode/PlatformStatusCode.c
@@ -19,7 +19,7 @@ Abstract:
 
 --*/
 
-#include "../MonoStatusCode.h"
+#include "MonoStatusCode.h"
 
 
 BOOLEAN gRunningFromMemory = FALSE;
diff --git a/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/build.xml b/EdkNt32Pkg/Pei/MonoStatusCode/build.xml
similarity index 97%
rename from EdkNt32Pkg/Pei/MonoStatusCode/Nt32/build.xml
rename to EdkNt32Pkg/Pei/MonoStatusCode/build.xml
index e6c8551241..bff195ac0d 100644
--- a/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/build.xml
+++ b/EdkNt32Pkg/Pei/MonoStatusCode/build.xml
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <property environment="env"/>
    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
    <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Pei\MonoStatusCode\Nt32"/>
+   <property name="MODULE_RELATIVE_PATH" value="Pei\MonoStatusCode"/>
    <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
    <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
    <target name="MonoStatusCode">