18 files changed, 11 insertions, 70 deletions
diff --git a/Nt32Pkg/BootModePei/BootMode.c b/Nt32Pkg/BootModePei/BootModePei.c
index 3ac2044c8f..3ac2044c8f 100644
--- a/Nt32Pkg/BootModePei/BootMode.c
+++ b/Nt32Pkg/BootModePei/BootModePei.c
diff --git a/Nt32Pkg/BootModePei/BootMode.inf b/Nt32Pkg/BootModePei/BootModePei.inf
index 24b469ef74..ae9d25f3c7 100644
--- a/Nt32Pkg/BootModePei/BootMode.inf
+++ b/Nt32Pkg/BootModePei/BootModePei.inf
@@ -43,8 +43,7 @@
 ################################################################################
 
 [Sources.common]
-  BootMode.c
-  CommonHeader.h
+  BootModePei.c
 
 
 ################################################################################
diff --git a/Nt32Pkg/BootModePei/BootMode.msa b/Nt32Pkg/BootModePei/BootModePei.msa
index e8225a8a85..e8225a8a85 100644
--- a/Nt32Pkg/BootModePei/BootMode.msa
+++ b/Nt32Pkg/BootModePei/BootModePei.msa
diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
index bb3c8537b9..bb3c8537b9 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.msa b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.msa
index f0f22f9540..f0f22f9540 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.msa
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.msa
diff --git a/Nt32Pkg/MetronomeDxe/Metronome.inf b/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
index 87ca79706c..87ca79706c 100644
--- a/Nt32Pkg/MetronomeDxe/Metronome.inf
+++ b/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
diff --git a/Nt32Pkg/MetronomeDxe/Metronome.msa b/Nt32Pkg/MetronomeDxe/MetronomeDxe.msa
index e4dc0b144b..e4dc0b144b 100644
--- a/Nt32Pkg/MetronomeDxe/Metronome.msa
+++ b/Nt32Pkg/MetronomeDxe/MetronomeDxe.msa
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
index 552aaf3cfe..552aaf3cfe 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.msa b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.msa
index 533ec7e1da..533ec7e1da 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.msa
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.msa
diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index fd84add5ff..9b372e7740 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -361,7 +361,7 @@
   $(WORKSPACE)/MdeModulePkg/Core/Pei/PeiMain.inf
   $(WORKSPACE)/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
-  $(WORKSPACE)/Nt32Pkg/BootModePei/BootMode.inf
+  $(WORKSPACE)/Nt32Pkg/BootModePei/BootModePei.inf
   $(WORKSPACE)/Nt32Pkg/WinNtFlashMapPei/FlashMap.inf
   $(WORKSPACE)/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf
   $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/Variable.inf
@@ -378,9 +378,9 @@
     <LibraryClass>
       PcdLib|$(WORKSPACE)/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.inf
   }
-  $(WORKSPACE)/Nt32Pkg/MetronomeDxe/Metronome.inf
-  $(WORKSPACE)/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
-  $(WORKSPACE)/Nt32Pkg/ResetRuntimeDxe/Reset.inf
+  $(WORKSPACE)/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
+  $(WORKSPACE)/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf  
+  $(WORKSPACE)/Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
   $(WORKSPACE)/MdeModulePkg/Universal/RuntimeDxe/Runtime.inf
   $(WORKSPACE)/Nt32Pkg/FvbServicesRuntimeDxe/Nt32Fwh.inf
   $(WORKSPACE)/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.inf
@@ -389,13 +389,13 @@
   $(WORKSPACE)/MdeModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.inf
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf
   $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf
-  $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.inf
-  $(WORKSPACE)/Nt32Pkg/CpuRuntimeDxe/Cpu.inf
-  $(WORKSPACE)/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf
-  $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.inf
+  $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.inf  
+  $(WORKSPACE)/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf        
+  $(WORKSPACE)/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf        
+  $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.inf      
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.inf
-  $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
-  $(WORKSPACE)/Nt32Pkg/TimerDxe/Timer.inf
+  $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
+  $(WORKSPACE)/Nt32Pkg/TimerDxe/TimerDxe.inf
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
   $(WORKSPACE)/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf
   $(WORKSPACE)/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf
diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf b/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf
index 1e084a3f18..1e084a3f18 100644
--- a/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf
+++ b/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf
diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformBds.msa b/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.msa
index 4e5dea1839..4e5dea1839 100644
--- a/Nt32Pkg/PlatformBdsDxe/PlatformBds.msa
+++ b/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.msa
diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
index fb53d6c6df..fb53d6c6df 100644
--- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
+++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.msa b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.msa
index 0fe3cd09bf..0fe3cd09bf 100644
--- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.msa
+++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.msa
diff --git a/Nt32Pkg/ResetRuntimeDxe/Reset.msa b/Nt32Pkg/ResetRuntimeDxe/Reset.msa
deleted file mode 100644
index 404da8d6ea..0000000000
--- a/Nt32Pkg/ResetRuntimeDxe/Reset.msa
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>Reset</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>BA929954-35B0-4dd3-90CD-9634BD7E1CF1</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>NT Emulation Reset Architectural Protocol Driver as defined in TIANO</Abstract>
-    <Description>This Reset module simulates system reset by process exit on NT.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Reset</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>WinNtLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>reset.c</Filename>
-    <Filename>Reset.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiResetArchProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeNtReset</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/Nt32Pkg/ResetRuntimeDxe/Reset.inf b/Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
index d586a81e3b..d586a81e3b 100644
--- a/Nt32Pkg/ResetRuntimeDxe/Reset.inf
+++ b/Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
diff --git a/Nt32Pkg/TimerDxe/Timer.inf b/Nt32Pkg/TimerDxe/TimerDxe.inf
index 12edfde81f..12edfde81f 100644
--- a/Nt32Pkg/TimerDxe/Timer.inf
+++ b/Nt32Pkg/TimerDxe/TimerDxe.inf
diff --git a/Nt32Pkg/TimerDxe/Timer.msa b/Nt32Pkg/TimerDxe/TimerDxe.msa
index b0227416bb..b0227416bb 100644
--- a/Nt32Pkg/TimerDxe/Timer.msa
+++ b/Nt32Pkg/TimerDxe/TimerDxe.msa