# FD Section\r
# The [FD] Section is made up of the definition statements and a\r
# description of what goes into the Flash Device Image. Each FD section\r
-# defines one flash ¡°device¡± image. A flash device image may be one of\r
+# defines one flash "device" image. A flash device image may be one of\r
# the following: Removable media bootable image (like a boot floppy\r
-# image,) an Option ROM image (that would be ¡°flashed¡± into an add-in\r
-# card,) a System ¡°Flash¡± image (that would be burned into a system¡¯s\r
-# flash) or an Update (¡°Capsule¡±) image that will be used to update and\r
+# image,) an Option ROM image (that would be "flashed" into an add-in\r
+# card,) a System "Flash" image (that would be burned into a system¡¯s\r
+# flash) or an Update ("Capsule") image that will be used to update and\r
# existing system flash.\r
#\r
################################################################################\r
#\r
# Regions must be defined in ascending order and may not overlap.\r
#\r
-# A Layout Region start with a eight digit hex offset (leading ¡°0x¡± required) followed by\r
-# the pipe ¡°|¡± character, followed by the size of the region, also in hex with the leading\r
-# ¡°0x¡± characters. Like:\r
+# A Layout Region start with a eight digit hex offset (leading "0x" required) followed by\r
+# the pipe "|" character, followed by the size of the region, also in hex with the leading\r
+# "0x" characters. Like:\r
# Offset|Size\r
# PcdOffsetCName|PcdSizeCName\r
# RegionType <FV, DATA, or FILE>\r
INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
INF $(WORKSPACE)/Nt32Pkg/BootModePei/BootModePei.inf\r
INF $(WORKSPACE)/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf\r
-INF $(WORKSPACE)/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf\r
-INF $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/VariablePei.inf\r
+INF $(WORKSPACE)/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf\r
+INF $(WORKSPACE)/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
INF $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf\r
INF $(WORKSPACE)/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf\r
INF $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf\r
INF $(WORKSPACE)/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf\r
INF $(WORKSPACE)/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
INF $(WORKSPACE)/Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
-INF $(WORKSPACE)/MdeModulePkg/Universal/RuntimeDxe/Runtime.inf\r
+INF $(WORKSPACE)/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
INF $(WORKSPACE)/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
-INF $(WORKSPACE)/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.inf\r
+INF $(WORKSPACE)/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
-INF $(WORKSPACE)/MdeModulePkg/Universal/GenericMemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
+INF $(WORKSPACE)/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf\r
INF $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/Crc32SectionExtractDxe/Crc32SectionExtractDxe.inf\r
INF $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf\r
INF $(WORKSPACE)/Nt32Pkg/TimerDxe/TimerDxe.inf\r
INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf\r
-INF $(WORKSPACE)/MdeModulePkg/Universal/VariableRuntimeDxe/VariableRuntimeDxe.inf\r
+INF $(WORKSPACE)/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r