UefiCpuPkg: Move to new location

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Guo Mang <mang.guo@intel.com>

343 files changed, 0 insertions, 0 deletions

diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/Core/UefiCpuPkg/Application/Cpuid/Cpuid.c
index 2efad68405..2efad68405 100644
--- a/UefiCpuPkg/Application/Cpuid/Cpuid.c
+++ b/Core/UefiCpuPkg/Application/Cpuid/Cpuid.c
diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.inf b/Core/UefiCpuPkg/Application/Cpuid/Cpuid.inf
index 0d71b115d9..0d71b115d9 100644
--- a/UefiCpuPkg/Application/Cpuid/Cpuid.inf
+++ b/Core/UefiCpuPkg/Application/Cpuid/Cpuid.inf
diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.uni b/Core/UefiCpuPkg/Application/Cpuid/Cpuid.uni
index 32dee43414..32dee43414 100644
--- a/UefiCpuPkg/Application/Cpuid/Cpuid.uni
+++ b/Core/UefiCpuPkg/Application/Cpuid/Cpuid.uni
diff --git a/UefiCpuPkg/Application/Cpuid/CpuidExtra.uni b/Core/UefiCpuPkg/Application/Cpuid/CpuidExtra.uni
index b4251e23cc..b4251e23cc 100644
--- a/UefiCpuPkg/Application/Cpuid/CpuidExtra.uni
+++ b/Core/UefiCpuPkg/Application/Cpuid/CpuidExtra.uni
diff --git a/UefiCpuPkg/Contributions.txt b/Core/UefiCpuPkg/Contributions.txt
index f87cbd73c6..f87cbd73c6 100644
--- a/UefiCpuPkg/Contributions.txt
+++ b/Core/UefiCpuPkg/Contributions.txt
diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.c b/Core/UefiCpuPkg/CpuDxe/CpuDxe.c
index 4a5e282741..4a5e282741 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.c
+++ b/Core/UefiCpuPkg/CpuDxe/CpuDxe.c
diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.h b/Core/UefiCpuPkg/CpuDxe/CpuDxe.h
index 27ad45bf9b..27ad45bf9b 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.h
+++ b/Core/UefiCpuPkg/CpuDxe/CpuDxe.h
diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/Core/UefiCpuPkg/CpuDxe/CpuDxe.inf
index 3e8d196739..3e8d196739 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/Core/UefiCpuPkg/CpuDxe/CpuDxe.inf
diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.uni b/Core/UefiCpuPkg/CpuDxe/CpuDxe.uni
index caf01dcbf5..caf01dcbf5 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.uni
+++ b/Core/UefiCpuPkg/CpuDxe/CpuDxe.uni
diff --git a/UefiCpuPkg/CpuDxe/CpuDxeExtra.uni b/Core/UefiCpuPkg/CpuDxe/CpuDxeExtra.uni
index c1d201911c..c1d201911c 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxeExtra.uni
+++ b/Core/UefiCpuPkg/CpuDxe/CpuDxeExtra.uni
diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.c b/Core/UefiCpuPkg/CpuDxe/CpuGdt.c
index 9ef2fdfefb..9ef2fdfefb 100644
--- a/UefiCpuPkg/CpuDxe/CpuGdt.c
+++ b/Core/UefiCpuPkg/CpuDxe/CpuGdt.c
diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.h b/Core/UefiCpuPkg/CpuDxe/CpuGdt.h
index 2a00751602..2a00751602 100644
--- a/UefiCpuPkg/CpuDxe/CpuGdt.h
+++ b/Core/UefiCpuPkg/CpuDxe/CpuGdt.h
diff --git a/UefiCpuPkg/CpuDxe/CpuMp.c b/Core/UefiCpuPkg/CpuDxe/CpuMp.c
index 44569466d3..44569466d3 100644
--- a/UefiCpuPkg/CpuDxe/CpuMp.c
+++ b/Core/UefiCpuPkg/CpuDxe/CpuMp.c
diff --git a/UefiCpuPkg/CpuDxe/CpuMp.h b/Core/UefiCpuPkg/CpuDxe/CpuMp.h
index 43ec3bdd0b..43ec3bdd0b 100644
--- a/UefiCpuPkg/CpuDxe/CpuMp.h
+++ b/Core/UefiCpuPkg/CpuDxe/CpuMp.h
diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.c b/Core/UefiCpuPkg/CpuDxe/CpuPageTable.c
index 2c61e7503e..2c61e7503e 100644
--- a/UefiCpuPkg/CpuDxe/CpuPageTable.c
+++ b/Core/UefiCpuPkg/CpuDxe/CpuPageTable.c
diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.h b/Core/UefiCpuPkg/CpuDxe/CpuPageTable.h
index eaff595b4c..eaff595b4c 100644
--- a/UefiCpuPkg/CpuDxe/CpuPageTable.h
+++ b/Core/UefiCpuPkg/CpuDxe/CpuPageTable.h
diff --git a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S b/Core/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
index e034bc2e2e..e034bc2e2e 100644
--- a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
+++ b/Core/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
diff --git a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm b/Core/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
index 7f8f0d6f3a..7f8f0d6f3a 100644
--- a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
+++ b/Core/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
diff --git a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.nasm b/Core/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.nasm
index c67ddfb010..c67ddfb010 100644
--- a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.nasm
+++ b/Core/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.nasm
diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.S b/Core/UefiCpuPkg/CpuDxe/X64/CpuAsm.S
index e82cadf369..e82cadf369 100644
--- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.S
+++ b/Core/UefiCpuPkg/CpuDxe/X64/CpuAsm.S
diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.asm b/Core/UefiCpuPkg/CpuDxe/X64/CpuAsm.asm
index c71b06a81e..c71b06a81e 100644
--- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.asm
+++ b/Core/UefiCpuPkg/CpuDxe/X64/CpuAsm.asm
diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm b/Core/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm
index 77ecfb3404..77ecfb3404 100644
--- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm
+++ b/Core/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm
diff --git a/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.c b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.c
index b0b186d36d..b0b186d36d 100644
--- a/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.c
+++ b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.c
diff --git a/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.inf b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.inf
index 175e8a9797..175e8a9797 100644
--- a/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.inf
+++ b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.inf
diff --git a/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.uni b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.uni
index c42e4daf43..c42e4daf43 100644
--- a/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.uni
+++ b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesDxe.uni
diff --git a/UefiCpuPkg/CpuFeatures/CpuFeaturesDxeExtra.uni b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesDxeExtra.uni
index 39a943e5a9..39a943e5a9 100644
--- a/UefiCpuPkg/CpuFeatures/CpuFeaturesDxeExtra.uni
+++ b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesDxeExtra.uni
diff --git a/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.c b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.c
index b052d554a9..b052d554a9 100644
--- a/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.c
+++ b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.c
diff --git a/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.inf b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.inf
index dd4b388c9a..dd4b388c9a 100644
--- a/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.inf
+++ b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.inf
diff --git a/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.uni b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.uni
index b03754aee6..b03754aee6 100644
--- a/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.uni
+++ b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesPei.uni
diff --git a/UefiCpuPkg/CpuFeatures/CpuFeaturesPeiExtra.uni b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesPeiExtra.uni
index 43dbe96197..43dbe96197 100644
--- a/UefiCpuPkg/CpuFeatures/CpuFeaturesPeiExtra.uni
+++ b/Core/UefiCpuPkg/CpuFeatures/CpuFeaturesPeiExtra.uni
diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c b/Core/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
index d19349d4b0..d19349d4b0 100644
--- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
+++ b/Core/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.h b/Core/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.h
index 7d00da16f4..7d00da16f4 100644
--- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.h
+++ b/Core/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.h
diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf b/Core/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
index 55036622ca..55036622ca 100644
--- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
+++ b/Core/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.uni b/Core/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.uni
index 59456fb3e5..59456fb3e5 100644
--- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.uni
+++ b/Core/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.uni
diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2DxeExtra.uni b/Core/UefiCpuPkg/CpuIo2Dxe/CpuIo2DxeExtra.uni
index 655da485df..655da485df 100644
--- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2DxeExtra.uni
+++ b/Core/UefiCpuPkg/CpuIo2Dxe/CpuIo2DxeExtra.uni
diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c b/Core/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
index 20b8350fe4..20b8350fe4 100644
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
+++ b/Core/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.h b/Core/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.h
index 5a092594d7..5a092594d7 100644
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.h
+++ b/Core/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.h
diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf b/Core/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
index d7c98f67c0..d7c98f67c0 100644
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
+++ b/Core/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.uni b/Core/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.uni
index c3a212b1e7..c3a212b1e7 100644
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.uni
+++ b/Core/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.uni
diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2SmmExtra.uni b/Core/UefiCpuPkg/CpuIo2Smm/CpuIo2SmmExtra.uni
index b1b82b03b7..b1b82b03b7 100644
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2SmmExtra.uni
+++ b/Core/UefiCpuPkg/CpuIo2Smm/CpuIo2SmmExtra.uni
diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.c b/Core/UefiCpuPkg/CpuIoPei/CpuIoPei.c
index b6d538b166..b6d538b166 100644
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.c
+++ b/Core/UefiCpuPkg/CpuIoPei/CpuIoPei.c
diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.h b/Core/UefiCpuPkg/CpuIoPei/CpuIoPei.h
index 052f0e3d0e..052f0e3d0e 100644
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.h
+++ b/Core/UefiCpuPkg/CpuIoPei/CpuIoPei.h
diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.inf b/Core/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
index b72ad6bfaf..b72ad6bfaf 100644
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
+++ b/Core/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.uni b/Core/UefiCpuPkg/CpuIoPei/CpuIoPei.uni
index 0d8a14ef12..0d8a14ef12 100644
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.uni
+++ b/Core/UefiCpuPkg/CpuIoPei/CpuIoPei.uni
diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPeiExtra.uni b/Core/UefiCpuPkg/CpuIoPei/CpuIoPeiExtra.uni
index cd1f53a0cc..cd1f53a0cc 100644
--- a/UefiCpuPkg/CpuIoPei/CpuIoPeiExtra.uni
+++ b/Core/UefiCpuPkg/CpuIoPei/CpuIoPeiExtra.uni
diff --git a/UefiCpuPkg/CpuMpPei/CpuBist.c b/Core/UefiCpuPkg/CpuMpPei/CpuBist.c
index bf18ca4556..bf18ca4556 100644
--- a/UefiCpuPkg/CpuMpPei/CpuBist.c
+++ b/Core/UefiCpuPkg/CpuMpPei/CpuBist.c
diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/Core/UefiCpuPkg/CpuMpPei/CpuMpPei.c
index eaf99c73cd..eaf99c73cd 100644
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c
+++ b/Core/UefiCpuPkg/CpuMpPei/CpuMpPei.c
diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.h b/Core/UefiCpuPkg/CpuMpPei/CpuMpPei.h
index 0836593efc..0836593efc 100644
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.h
+++ b/Core/UefiCpuPkg/CpuMpPei/CpuMpPei.h
diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf b/Core/UefiCpuPkg/CpuMpPei/CpuMpPei.inf
index 3b40d88201..3b40d88201 100644
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf
+++ b/Core/UefiCpuPkg/CpuMpPei/CpuMpPei.inf
diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.uni b/Core/UefiCpuPkg/CpuMpPei/CpuMpPei.uni
index d458d0d624..d458d0d624 100644
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.uni
+++ b/Core/UefiCpuPkg/CpuMpPei/CpuMpPei.uni
diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPeiExtra.uni b/Core/UefiCpuPkg/CpuMpPei/CpuMpPeiExtra.uni
index cf832fb80b..cf832fb80b 100644
--- a/UefiCpuPkg/CpuMpPei/CpuMpPeiExtra.uni
+++ b/Core/UefiCpuPkg/CpuMpPei/CpuMpPeiExtra.uni
diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c b/Core/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c
index dccb406b8d..dccb406b8d 100644
--- a/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c
+++ b/Core/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c
diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf b/Core/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
index 480c98ebcd..480c98ebcd 100644
--- a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
+++ b/Core/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni b/Core/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni
index 4a0218f180..4a0218f180 100644
--- a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni
+++ b/Core/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni
diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni b/Core/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni
index 050f25f843..050f25f843 100644
--- a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni
+++ b/Core/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni
diff --git a/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.c b/Core/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.c
index 7a5ec152d7..7a5ec152d7 100644
--- a/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.c
+++ b/Core/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.c
diff --git a/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.inf b/Core/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.inf
index a4a47e0737..a4a47e0737 100644
--- a/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.inf
+++ b/Core/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.inf
diff --git a/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.uni b/Core/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.uni
index cc4195c412..cc4195c412 100644
--- a/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.uni
+++ b/Core/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.uni
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.dsc b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.dsc
index 1b22c55117..1b22c55117 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.dsc
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.dsc
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.fdf b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.fdf
index f171604d4f..f171604d4f 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.fdf
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.fdf
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/Readme.md b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/Readme.md
index 9f81373fda..9f81373fda 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/Readme.md
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/Readme.md
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Microcode/Microcode.inf b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Microcode/Microcode.inf
index 81af841f2c..81af841f2c 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Microcode/Microcode.inf
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Microcode/Microcode.inf
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.dsc b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.dsc
index a66f89b4e2..a66f89b4e2 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.dsc
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.dsc
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.fdf b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.fdf
index 113693b1df..113693b1df 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.fdf
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.fdf
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Readme.md b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Readme.md
index f7d7040fcb..f7d7040fcb 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Readme.md
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Readme.md
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeFmp.c b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeFmp.c
index ebde93a91e..ebde93a91e 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeFmp.c
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeFmp.c
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c
index 4e8f1d5fd8..4e8f1d5fd8 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.h b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.h
index 9dc306324e..9dc306324e 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.h
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.h
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf
index 55797cf132..55797cf132 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.uni b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.uni
index 1b0d4941dc..1b0d4941dc 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.uni
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.uni
diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxeExtra.uni b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxeExtra.uni
index b667f12f5c..b667f12f5c 100644
--- a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxeExtra.uni
+++ b/Core/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxeExtra.uni
diff --git a/UefiCpuPkg/Include/AcpiCpuData.h b/Core/UefiCpuPkg/Include/AcpiCpuData.h
index ec092074ce..ec092074ce 100644
--- a/UefiCpuPkg/Include/AcpiCpuData.h
+++ b/Core/UefiCpuPkg/Include/AcpiCpuData.h
diff --git a/UefiCpuPkg/Include/CpuHotPlugData.h b/Core/UefiCpuPkg/Include/CpuHotPlugData.h
index 2a0d9fabd5..2a0d9fabd5 100644
--- a/UefiCpuPkg/Include/CpuHotPlugData.h
+++ b/Core/UefiCpuPkg/Include/CpuHotPlugData.h
diff --git a/UefiCpuPkg/Include/Guid/CpuFeaturesInitDone.h b/Core/UefiCpuPkg/Include/Guid/CpuFeaturesInitDone.h
index 70b5c704d5..70b5c704d5 100644
--- a/UefiCpuPkg/Include/Guid/CpuFeaturesInitDone.h
+++ b/Core/UefiCpuPkg/Include/Guid/CpuFeaturesInitDone.h
diff --git a/UefiCpuPkg/Include/Guid/CpuFeaturesSetDone.h b/Core/UefiCpuPkg/Include/Guid/CpuFeaturesSetDone.h
index bf085c726c..bf085c726c 100644
--- a/UefiCpuPkg/Include/Guid/CpuFeaturesSetDone.h
+++ b/Core/UefiCpuPkg/Include/Guid/CpuFeaturesSetDone.h
diff --git a/UefiCpuPkg/Include/Guid/MicrocodeFmp.h b/Core/UefiCpuPkg/Include/Guid/MicrocodeFmp.h
index 88a19538c8..88a19538c8 100644
--- a/UefiCpuPkg/Include/Guid/MicrocodeFmp.h
+++ b/Core/UefiCpuPkg/Include/Guid/MicrocodeFmp.h
diff --git a/UefiCpuPkg/Include/Guid/MsegSmram.h b/Core/UefiCpuPkg/Include/Guid/MsegSmram.h
index ab337c4ccb..ab337c4ccb 100644
--- a/UefiCpuPkg/Include/Guid/MsegSmram.h
+++ b/Core/UefiCpuPkg/Include/Guid/MsegSmram.h
diff --git a/UefiCpuPkg/Include/Library/LocalApicLib.h b/Core/UefiCpuPkg/Include/Library/LocalApicLib.h
index fc980bc1f2..fc980bc1f2 100644
--- a/UefiCpuPkg/Include/Library/LocalApicLib.h
+++ b/Core/UefiCpuPkg/Include/Library/LocalApicLib.h
diff --git a/UefiCpuPkg/Include/Library/MicrocodeFlashAccessLib.h b/Core/UefiCpuPkg/Include/Library/MicrocodeFlashAccessLib.h
index 0dfc3ef376..0dfc3ef376 100644
--- a/UefiCpuPkg/Include/Library/MicrocodeFlashAccessLib.h
+++ b/Core/UefiCpuPkg/Include/Library/MicrocodeFlashAccessLib.h
diff --git a/UefiCpuPkg/Include/Library/MpInitLib.h b/Core/UefiCpuPkg/Include/Library/MpInitLib.h
index 05e9c6b3e6..05e9c6b3e6 100644
--- a/UefiCpuPkg/Include/Library/MpInitLib.h
+++ b/Core/UefiCpuPkg/Include/Library/MpInitLib.h
diff --git a/UefiCpuPkg/Include/Library/MtrrLib.h b/Core/UefiCpuPkg/Include/Library/MtrrLib.h
index a63da4d1f5..a63da4d1f5 100644
--- a/UefiCpuPkg/Include/Library/MtrrLib.h
+++ b/Core/UefiCpuPkg/Include/Library/MtrrLib.h
diff --git a/UefiCpuPkg/Include/Library/PlatformSecLib.h b/Core/UefiCpuPkg/Include/Library/PlatformSecLib.h
index 0af7781771..0af7781771 100644
--- a/UefiCpuPkg/Include/Library/PlatformSecLib.h
+++ b/Core/UefiCpuPkg/Include/Library/PlatformSecLib.h
diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h b/Core/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
index 4aa3529eb7..4aa3529eb7 100644
--- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
+++ b/Core/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
diff --git a/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h b/Core/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h
index 4478003467..4478003467 100644
--- a/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h
+++ b/Core/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h
diff --git a/UefiCpuPkg/Include/Library/SmmCpuPlatformHookLib.h b/Core/UefiCpuPkg/Include/Library/SmmCpuPlatformHookLib.h
index e40084edf9..e40084edf9 100644
--- a/UefiCpuPkg/Include/Library/SmmCpuPlatformHookLib.h
+++ b/Core/UefiCpuPkg/Include/Library/SmmCpuPlatformHookLib.h
diff --git a/UefiCpuPkg/Include/Library/UefiCpuLib.h b/Core/UefiCpuPkg/Include/Library/UefiCpuLib.h
index 561d579968..561d579968 100644
--- a/UefiCpuPkg/Include/Library/UefiCpuLib.h
+++ b/Core/UefiCpuPkg/Include/Library/UefiCpuLib.h
diff --git a/UefiCpuPkg/Include/Protocol/SmMonitorInit.h b/Core/UefiCpuPkg/Include/Protocol/SmMonitorInit.h
index 7b0aab0a6d..7b0aab0a6d 100644
--- a/UefiCpuPkg/Include/Protocol/SmMonitorInit.h
+++ b/Core/UefiCpuPkg/Include/Protocol/SmMonitorInit.h
diff --git a/UefiCpuPkg/Include/Protocol/SmmCpuService.h b/Core/UefiCpuPkg/Include/Protocol/SmmCpuService.h
index 9aced54f4d..9aced54f4d 100644
--- a/UefiCpuPkg/Include/Protocol/SmmCpuService.h
+++ b/Core/UefiCpuPkg/Include/Protocol/SmmCpuService.h
diff --git a/UefiCpuPkg/Include/Register/ArchitecturalMsr.h b/Core/UefiCpuPkg/Include/Register/ArchitecturalMsr.h
index 4f9c1033f3..4f9c1033f3 100644
--- a/UefiCpuPkg/Include/Register/ArchitecturalMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/ArchitecturalMsr.h
diff --git a/UefiCpuPkg/Include/Register/Cpuid.h b/Core/UefiCpuPkg/Include/Register/Cpuid.h
index 5eb9650553..5eb9650553 100644
--- a/UefiCpuPkg/Include/Register/Cpuid.h
+++ b/Core/UefiCpuPkg/Include/Register/Cpuid.h
diff --git a/UefiCpuPkg/Include/Register/LocalApic.h b/Core/UefiCpuPkg/Include/Register/LocalApic.h
index cfb6d76d8b..cfb6d76d8b 100644
--- a/UefiCpuPkg/Include/Register/LocalApic.h
+++ b/Core/UefiCpuPkg/Include/Register/LocalApic.h
diff --git a/UefiCpuPkg/Include/Register/Microcode.h b/Core/UefiCpuPkg/Include/Register/Microcode.h
index 94529a1ca2..94529a1ca2 100644
--- a/UefiCpuPkg/Include/Register/Microcode.h
+++ b/Core/UefiCpuPkg/Include/Register/Microcode.h
diff --git a/UefiCpuPkg/Include/Register/Msr.h b/Core/UefiCpuPkg/Include/Register/Msr.h
index 0ac8d5bdfd..0ac8d5bdfd 100644
--- a/UefiCpuPkg/Include/Register/Msr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/AtomMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/AtomMsr.h
index b2764690f5..b2764690f5 100644
--- a/UefiCpuPkg/Include/Register/Msr/AtomMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/AtomMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/BroadwellMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/BroadwellMsr.h
index 90bd523c99..90bd523c99 100644
--- a/UefiCpuPkg/Include/Register/Msr/BroadwellMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/BroadwellMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/Core2Msr.h b/Core/UefiCpuPkg/Include/Register/Msr/Core2Msr.h
index 9ebca5e9b5..9ebca5e9b5 100644
--- a/UefiCpuPkg/Include/Register/Msr/Core2Msr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/Core2Msr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/CoreMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/CoreMsr.h
index 4897c74d5a..4897c74d5a 100644
--- a/UefiCpuPkg/Include/Register/Msr/CoreMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/CoreMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/GoldmontMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/GoldmontMsr.h
index 5730918ec6..5730918ec6 100644
--- a/UefiCpuPkg/Include/Register/Msr/GoldmontMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/GoldmontMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/HaswellEMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/HaswellEMsr.h
index b737a9e4b8..b737a9e4b8 100644
--- a/UefiCpuPkg/Include/Register/Msr/HaswellEMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/HaswellEMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/HaswellMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/HaswellMsr.h
index 3cd15846b4..3cd15846b4 100644
--- a/UefiCpuPkg/Include/Register/Msr/HaswellMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/HaswellMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/IvyBridgeMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/IvyBridgeMsr.h
index 9eb07994ec..9eb07994ec 100644
--- a/UefiCpuPkg/Include/Register/Msr/IvyBridgeMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/IvyBridgeMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/NehalemMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/NehalemMsr.h
index 94aebba4d1..94aebba4d1 100644
--- a/UefiCpuPkg/Include/Register/Msr/NehalemMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/NehalemMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/P6Msr.h b/Core/UefiCpuPkg/Include/Register/Msr/P6Msr.h
index aec2e2c868..aec2e2c868 100644
--- a/UefiCpuPkg/Include/Register/Msr/P6Msr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/P6Msr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/Pentium4Msr.h b/Core/UefiCpuPkg/Include/Register/Msr/Pentium4Msr.h
index 8922d56e2f..8922d56e2f 100644
--- a/UefiCpuPkg/Include/Register/Msr/Pentium4Msr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/Pentium4Msr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/PentiumMMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/PentiumMMsr.h
index 70d54c81ee..70d54c81ee 100644
--- a/UefiCpuPkg/Include/Register/Msr/PentiumMMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/PentiumMMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/PentiumMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/PentiumMsr.h
index 9b2578bac8..9b2578bac8 100644
--- a/UefiCpuPkg/Include/Register/Msr/PentiumMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/PentiumMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/SandyBridgeMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/SandyBridgeMsr.h
index c8a0b971d3..c8a0b971d3 100644
--- a/UefiCpuPkg/Include/Register/Msr/SandyBridgeMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/SandyBridgeMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/SilvermontMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/SilvermontMsr.h
index ec09bf3c13..ec09bf3c13 100644
--- a/UefiCpuPkg/Include/Register/Msr/SilvermontMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/SilvermontMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/SkylakeMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/SkylakeMsr.h
index 7166e5f9e0..7166e5f9e0 100644
--- a/UefiCpuPkg/Include/Register/Msr/SkylakeMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/SkylakeMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/Xeon5600Msr.h b/Core/UefiCpuPkg/Include/Register/Msr/Xeon5600Msr.h
index ad7128ae95..ad7128ae95 100644
--- a/UefiCpuPkg/Include/Register/Msr/Xeon5600Msr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/Xeon5600Msr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/XeonDMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/XeonDMsr.h
index 7b31288a35..7b31288a35 100644
--- a/UefiCpuPkg/Include/Register/Msr/XeonDMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/XeonDMsr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/XeonE7Msr.h b/Core/UefiCpuPkg/Include/Register/Msr/XeonE7Msr.h
index d509660c52..d509660c52 100644
--- a/UefiCpuPkg/Include/Register/Msr/XeonE7Msr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/XeonE7Msr.h
diff --git a/UefiCpuPkg/Include/Register/Msr/XeonPhiMsr.h b/Core/UefiCpuPkg/Include/Register/Msr/XeonPhiMsr.h
index 43354d15c9..43354d15c9 100644
--- a/UefiCpuPkg/Include/Register/Msr/XeonPhiMsr.h
+++ b/Core/UefiCpuPkg/Include/Register/Msr/XeonPhiMsr.h
diff --git a/UefiCpuPkg/Include/Register/SmramSaveStateMap.h b/Core/UefiCpuPkg/Include/Register/SmramSaveStateMap.h
index a7c7562df8..a7c7562df8 100644
--- a/UefiCpuPkg/Include/Register/SmramSaveStateMap.h
+++ b/Core/UefiCpuPkg/Include/Register/SmramSaveStateMap.h
diff --git a/UefiCpuPkg/Include/Register/StmApi.h b/Core/UefiCpuPkg/Include/Register/StmApi.h
index 6fb5971b44..6fb5971b44 100644
--- a/UefiCpuPkg/Include/Register/StmApi.h
+++ b/Core/UefiCpuPkg/Include/Register/StmApi.h
diff --git a/UefiCpuPkg/Include/Register/StmResourceDescriptor.h b/Core/UefiCpuPkg/Include/Register/StmResourceDescriptor.h
index 1518462ec0..1518462ec0 100644
--- a/UefiCpuPkg/Include/Register/StmResourceDescriptor.h
+++ b/Core/UefiCpuPkg/Include/Register/StmResourceDescriptor.h
diff --git a/UefiCpuPkg/Include/Register/StmStatusCode.h b/Core/UefiCpuPkg/Include/Register/StmStatusCode.h
index f1fcb8b6ef..f1fcb8b6ef 100644
--- a/UefiCpuPkg/Include/Register/StmStatusCode.h
+++ b/Core/UefiCpuPkg/Include/Register/StmStatusCode.h
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
index b397ce0dc6..b397ce0dc6 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
+++ b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni
index 1a1c0d2411..1a1c0d2411 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni
+++ b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S
index 4972bc2e7f..4972bc2e7f 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S
+++ b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.asm b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.asm
index 3c31da98f6..3c31da98f6 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.asm
+++ b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.asm
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.nasm b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.nasm
index 55085e019f..55085e019f 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.nasm
+++ b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.nasm
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S
index 97d9f72338..97d9f72338 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S
+++ b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.asm b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.asm
index 331af15cc6..331af15cc6 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.asm
+++ b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.asm
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.nasm b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.nasm
index 904b64e510..904b64e510 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.nasm
+++ b/Core/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.nasm
diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c b/Core/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
index f81bbb2252..f81bbb2252 100644
--- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
+++ b/Core/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf b/Core/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
index 7dd2714af3..7dd2714af3 100644
--- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
+++ b/Core/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.uni b/Core/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.uni
index 49b05e6cec..49b05e6cec 100644
--- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.uni
+++ b/Core/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.uni
diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c b/Core/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
index e690d2aa14..e690d2aa14 100644
--- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
+++ b/Core/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf b/Core/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
index 53e186858f..53e186858f 100644
--- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
+++ b/Core/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.uni b/Core/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.uni
index 97f62273ba..97f62273ba 100644
--- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.uni
+++ b/Core/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.uni
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
index 178bfb50ab..178bfb50ab 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/C1e.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/C1e.c
index 47116355a8..47116355a8 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/C1e.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/C1e.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c
index 56e53561e9..56e53561e9 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h
index aa6d1122b1..aa6d1122b1 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c
index 3390aa8f2a..3390aa8f2a 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.inf b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.inf
index e68936be25..e68936be25 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.inf
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.inf
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.uni b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.uni
index d1a90c32d4..d1a90c32d4 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.uni
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.uni
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Eist.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/Eist.c
index 2038171a14..2038171a14 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Eist.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/Eist.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ExecuteDisable.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/ExecuteDisable.c
index 921656a1e8..921656a1e8 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ExecuteDisable.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/ExecuteDisable.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/FastStrings.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/FastStrings.c
index 029bcf87b3..029bcf87b3 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/FastStrings.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/FastStrings.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c
index 0b5c161f87..0b5c161f87 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
index 40cc9d5fe0..40cc9d5fe0 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
index 72f665d32e..72f665d32e 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MonitorMwait.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/MonitorMwait.c
index 1d43bd128a..1d43bd128a 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MonitorMwait.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/MonitorMwait.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/PendingBreak.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/PendingBreak.c
index 8cafba4f4a..8cafba4f4a 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/PendingBreak.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/PendingBreak.c
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c
index 9c2ad9ad31..9c2ad9ad31 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c
+++ b/Core/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
index 78ee182e8d..78ee182e8d 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
index 740a58828b..740a58828b 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
index f4a8d01c80..f4a8d01c80 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.uni b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.uni
index ace4b6f287..ace4b6f287 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.uni
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.uni
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
index 31febec976..31febec976 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ArchExceptionHandler.c b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ArchExceptionHandler.c
index f2c39eb193..f2c39eb193 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ArchExceptionHandler.c
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ArchExceptionHandler.c
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ArchInterruptDefs.h b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ArchInterruptDefs.h
index a8d3556a80..a8d3556a80 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ArchInterruptDefs.h
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ArchInterruptDefs.h
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S
index c134257d9d..c134257d9d 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm
index 126680ea47..126680ea47 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.nasm b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.nasm
index 45d6474091..45d6474091 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.nasm
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.nasm
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuException.c b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuException.c
index 8d8d16ecbd..8d8d16ecbd 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuException.c
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuException.c
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
index 75443288a9..75443288a9 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.uni b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.uni
index a89537f7ff..a89537f7ff 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.uni
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.uni
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c
index 0facfde5dd..0facfde5dd 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c
index af608bffb6..af608bffb6 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
index d70a99c100..d70a99c100 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.uni b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.uni
index de8b846a67..de8b846a67 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.uni
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.uni
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
index 634ffcb21d..634ffcb21d 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.uni b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.uni
index 3dfa69547b..3dfa69547b 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.uni
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.uni
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
index 7414d3f773..7414d3f773 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchExceptionHandler.c b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchExceptionHandler.c
index 65f0cff680..65f0cff680 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchExceptionHandler.c
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchExceptionHandler.c
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchInterruptDefs.h b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchInterruptDefs.h
index 906480134a..906480134a 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchInterruptDefs.h
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchInterruptDefs.h
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.S b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.S
index edd363cdaa..edd363cdaa 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.S
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.S
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.asm b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.asm
index 726c64a140..726c64a140 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.asm
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.asm
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm
index ba8993d84b..ba8993d84b 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm
+++ b/Core/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm
diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf b/Core/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
index 9751ba1f0d..9751ba1f0d 100644
--- a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
+++ b/Core/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.uni b/Core/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.uni
index 99d79974be..99d79974be 100644
--- a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.uni
+++ b/Core/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.uni
diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c b/Core/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
index b393244e05..b393244e05 100644
--- a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
+++ b/Core/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc b/Core/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
index 62762308e2..62762308e2 100644
--- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
+++ b/Core/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm b/Core/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
index 52363e6e08..52363e6e08 100644
--- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
+++ b/Core/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
diff --git a/UefiCpuPkg/Library/MpInitLib/Microcode.c b/Core/UefiCpuPkg/Library/MpInitLib/Microcode.c
index 982995be7d..982995be7d 100644
--- a/UefiCpuPkg/Library/MpInitLib/Microcode.c
+++ b/Core/UefiCpuPkg/Library/MpInitLib/Microcode.c
diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/Core/UefiCpuPkg/Library/MpInitLib/MpLib.c
index 03d6c2d89e..03d6c2d89e 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/Core/UefiCpuPkg/Library/MpInitLib/MpLib.c
diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/Core/UefiCpuPkg/Library/MpInitLib/MpLib.h
index 7a272d78ec..7a272d78ec 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.h
+++ b/Core/UefiCpuPkg/Library/MpInitLib/MpLib.h
diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf b/Core/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
index 0c6873da79..0c6873da79 100644
--- a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
+++ b/Core/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.uni b/Core/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.uni
index d16f306685..d16f306685 100644
--- a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.uni
+++ b/Core/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.uni
diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c b/Core/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
index fb1d48fad8..fb1d48fad8 100644
--- a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
+++ b/Core/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc b/Core/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
index a63cd23a40..a63cd23a40 100644
--- a/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
+++ b/Core/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/Core/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
index fa54d01542..fa54d01542 100644
--- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
+++ b/Core/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/Core/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
index c38191a7ef..c38191a7ef 100644
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
+++ b/Core/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf b/Core/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
index 01a4d84da0..01a4d84da0 100644
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
+++ b/Core/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.uni b/Core/UefiCpuPkg/Library/MtrrLib/MtrrLib.uni
index 34753a089a..34753a089a 100644
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.uni
+++ b/Core/UefiCpuPkg/Library/MtrrLib/MtrrLib.uni
diff --git a/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.c b/Core/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.c
index ad3e9090c6..ad3e9090c6 100644
--- a/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.c
+++ b/Core/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.c
diff --git a/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.inf b/Core/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.inf
index 3f8868adee..3f8868adee 100644
--- a/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.inf
+++ b/Core/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.inf
diff --git a/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.uni b/Core/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.uni
index d7212f0351..d7212f0351 100644
--- a/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.uni
+++ b/Core/UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.uni
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
index 5e11b2b21c..5e11b2b21c 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
+++ b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c
index 902a339529..902a339529 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c
+++ b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.inf b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.inf
index 62ac8a9635..62ac8a9635 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.inf
+++ b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.inf
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c
index 6804eddf65..6804eddf65 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c
+++ b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf
index 5e9ab2c304..5e9ab2c304 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf
+++ b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h
index 7731f885b3..7731f885b3 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h
+++ b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesDxe.uni b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesDxe.uni
index d928952551..d928952551 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesDxe.uni
+++ b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesDxe.uni
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
index 338f1a495c..338f1a495c 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
+++ b/Core/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
diff --git a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/IpfTimerLib.c b/Core/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/IpfTimerLib.c
index 714b99eec4..714b99eec4 100644
--- a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/IpfTimerLib.c
+++ b/Core/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/IpfTimerLib.c
diff --git a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf b/Core/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf
index a25e94a61a..a25e94a61a 100644
--- a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf
+++ b/Core/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf
diff --git a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.uni b/Core/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.uni
index da9e4d8191..da9e4d8191 100644
--- a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.uni
+++ b/Core/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.uni
diff --git a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c b/Core/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
index f703d7e477..f703d7e477 100644
--- a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
+++ b/Core/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.S b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.S
index 4c0f8c8933..4c0f8c8933 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.S
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.S
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm
index 94888d5aec..94888d5aec 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm
index b1c84a494f..b1c84a494f 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.S b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.S
index 7d0057af80..7d0057af80 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.S
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.S
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.asm b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.asm
index 7c04ad91f2..7c04ad91f2 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.asm
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.asm
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm
index 0ce8501ba9..0ce8501ba9 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmmStmSupport.c b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmmStmSupport.c
index 0154c7c0f8..0154c7c0f8 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmmStmSupport.c
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmmStmSupport.c
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
index 079baa4ae1..079baa4ae1 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
index 77908b0366..77908b0366 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni
index 322aa8bb5a..322aa8bb5a 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibNoStm.c b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibNoStm.c
index 5276856797..5276856797 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibNoStm.c
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibNoStm.c
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf
index db8dcdcff4..db8dcdcff4 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
index 03937dcbe2..03937dcbe2 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.h b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.h
index 92a4dc00eb..92a4dc00eb 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.h
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.h
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.S b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.S
index 1f9f91ce10..1f9f91ce10 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.S
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.S
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.asm b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.asm
index ad51e07079..ad51e07079 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.asm
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.asm
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm
index c801591fc7..c801591fc7 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.S b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.S
index 4d0cd9ac6f..4d0cd9ac6f 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.S
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.S
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.asm b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.asm
index 33e9860160..33e9860160 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.asm
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.asm
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm
index fe1bf3f165..fe1bf3f165 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmmStmSupport.c b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmmStmSupport.c
index 6681234783..6681234783 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmmStmSupport.c
+++ b/Core/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmmStmSupport.c
diff --git a/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.c b/Core/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.c
index efb61fa6f8..efb61fa6f8 100644
--- a/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.c
+++ b/Core/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.c
diff --git a/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf b/Core/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf
index 4dea5fb4e1..4dea5fb4e1 100644
--- a/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf
+++ b/Core/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf
diff --git a/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.uni b/Core/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.uni
index 46de9f3494..46de9f3494 100644
--- a/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.uni
+++ b/Core/UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.uni
diff --git a/UefiCpuPkg/License.txt b/Core/UefiCpuPkg/License.txt
index be68999be6..be68999be6 100644
--- a/UefiCpuPkg/License.txt
+++ b/Core/UefiCpuPkg/License.txt
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c
index aaeaa06729..aaeaa06729 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c
+++ b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf
index 5cb596c564..5cb596c564 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf
+++ b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.uni b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.uni
index 697bb2b3d9..697bb2b3d9 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.uni
+++ b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.uni
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPeiExtra.uni b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPeiExtra.uni
index 62e3f97928..62e3f97928 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPeiExtra.uni
+++ b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPeiExtra.uni
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPrivate.h b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPrivate.h
index 3dd5ac6e38..3dd5ac6e38 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPrivate.h
+++ b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPrivate.h
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
index 077eacce88..077eacce88 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
+++ b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
index 9b03837cf3..9b03837cf3 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
+++ b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni
index 55df3905df..55df3905df 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni
+++ b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni
index 34e7731fb5..34e7731fb5 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni
+++ b/Core/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
index 9404501498..9404501498 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
index 29f3a58939..29f3a58939 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.h b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.h
index 9fe3f45b02..9fe3f45b02 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.h
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.h
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.S b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.S
index 75aa312a6e..75aa312a6e 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.S
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.S
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.asm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.asm
index 70e24a8270..70e24a8270 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.asm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.asm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.nasm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.nasm
index f7cdcce9a7..f7cdcce9a7 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.nasm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.nasm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
index 32ce5958c5..32ce5958c5 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c
index 02a866b430..02a866b430 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.S b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.S
index 62f1697efa..62f1697efa 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.S
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.S
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.asm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.asm
index 8296f36d26..8296f36d26 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.asm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.asm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm
index 4d2383ff97..4d2383ff97 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S
index 4600c7c36e..4600c7c36e 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm
index 80a44b861f..80a44b861f 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
index 7c80a6ae91..7c80a6ae91 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmFuncsArch.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmFuncsArch.c
index 3c68c97024..3c68c97024 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmFuncsArch.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmFuncsArch.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.S b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.S
index e8db33a45a..e8db33a45a 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.S
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.S
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.asm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.asm
index 9ba2aebe69..9ba2aebe69 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.asm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.asm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm
index d9df3626c7..d9df3626c7 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.c
index 724cd92c9c..724cd92c9c 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.h b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.h
index 3e15bffc60..3e15bffc60 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.h
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.h
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
index a1d16b4570..a1d16b4570 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
index 2cb0bbcff6..2cb0bbcff6 100755
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
index dbce9ec520..dbce9ec520 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
index 099792e6ce..099792e6ce 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.uni b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.uni
index 98eae1d697..98eae1d697 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.uni
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.uni
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmmExtra.uni b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmmExtra.uni
index d0a8d54006..d0a8d54006 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmmExtra.uni
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmmExtra.uni
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
index a535389c26..a535389c26 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
index 2713b19dd2..2713b19dd2 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h
index 04a3dfb2e8..04a3dfb2e8 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
index a21689145b..a21689145b 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
index 3188d43818..3188d43818 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SyncTimer.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SyncTimer.c
index 5a632eaa24..5a632eaa24 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SyncTimer.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/SyncTimer.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.S b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.S
index d7cbc8cdc5..d7cbc8cdc5 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.S
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.S
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.asm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.asm
index 2c5a7c9bc2..2c5a7c9bc2 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.asm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.asm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.nasm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.nasm
index 702233d6e4..702233d6e4 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.nasm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.nasm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
index 32385faae4..32385faae4 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c
index 6dbcb086aa..6dbcb086aa 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S
index 600d8623cd..600d8623cd 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm
index c74f82aac8..c74f82aac8 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
index c3c094ff9f..c3c094ff9f 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S
index 338bb70dd8..338bb70dd8 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm
index 80bd739ff4..80bd739ff4 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
index b2e2e6dee6..b2e2e6dee6 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmFuncsArch.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmFuncsArch.c
index 9d26e44a9a..9d26e44a9a 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmFuncsArch.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmFuncsArch.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.S b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.S
index 5e352f57c3..5e352f57c3 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.S
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.S
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.asm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.asm
index 9182f0293a..9182f0293a 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.asm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.asm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm
index 9d05e2cb05..9d05e2cb05 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c
index 37da5fb78d..37da5fb78d 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.h b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.h
index 32f33139bf..32f33139bf 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.h
+++ b/Core/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.h
diff --git a/UefiCpuPkg/ResetVector/FixupVtf/ResetVector.uni b/Core/UefiCpuPkg/ResetVector/FixupVtf/ResetVector.uni
index 06af9d2ff0..06af9d2ff0 100644
--- a/UefiCpuPkg/ResetVector/FixupVtf/ResetVector.uni
+++ b/Core/UefiCpuPkg/ResetVector/FixupVtf/ResetVector.uni
diff --git a/UefiCpuPkg/ResetVector/FixupVtf/ResetVectorExtra.uni b/Core/UefiCpuPkg/ResetVector/FixupVtf/ResetVectorExtra.uni
index f18a4f0443..f18a4f0443 100644
--- a/UefiCpuPkg/ResetVector/FixupVtf/ResetVectorExtra.uni
+++ b/Core/UefiCpuPkg/ResetVector/FixupVtf/ResetVectorExtra.uni
diff --git a/UefiCpuPkg/ResetVector/FixupVtf/Vtf.inf b/Core/UefiCpuPkg/ResetVector/FixupVtf/Vtf.inf
index ed41c3807d..ed41c3807d 100644
--- a/UefiCpuPkg/ResetVector/FixupVtf/Vtf.inf
+++ b/Core/UefiCpuPkg/ResetVector/FixupVtf/Vtf.inf
diff --git a/UefiCpuPkg/ResetVector/FixupVtf/Vtf.nasmb b/Core/UefiCpuPkg/ResetVector/FixupVtf/Vtf.nasmb
index 5aa733ea59..5aa733ea59 100644
--- a/UefiCpuPkg/ResetVector/FixupVtf/Vtf.nasmb
+++ b/Core/UefiCpuPkg/ResetVector/FixupVtf/Vtf.nasmb
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.port80.raw b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.port80.raw
index 2c6ff655de..2c6ff655de 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.port80.raw
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.port80.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw
index e34780a3a2..e34780a3a2 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.serial.raw b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.serial.raw
index 6dfa68eabb..6dfa68eabb 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.serial.raw
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.serial.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
index 72abd6e91c..72abd6e91c 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.uni b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.uni
index 43eba267b6..43eba267b6 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.uni
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.uni
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw
index 6c0bcc47eb..6c0bcc47eb 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw
index a78d5b407c..a78d5b407c 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw
index 61c71349a8..61c71349a8 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVectorExtra.uni b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVectorExtra.uni
index f18a4f0443..f18a4f0443 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVectorExtra.uni
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVectorExtra.uni
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Build.py b/Core/UefiCpuPkg/ResetVector/Vtf0/Build.py
index a645c371b9..a645c371b9 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Build.py
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Build.py
diff --git a/UefiCpuPkg/ResetVector/Vtf0/CommonMacros.inc b/Core/UefiCpuPkg/ResetVector/Vtf0/CommonMacros.inc
index b46da27686..b46da27686 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/CommonMacros.inc
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/CommonMacros.inc
diff --git a/UefiCpuPkg/ResetVector/Vtf0/DebugDisabled.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/DebugDisabled.asm
index 883cef03e0..883cef03e0 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/DebugDisabled.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/DebugDisabled.asm
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Init16.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia16/Init16.asm
index 226c49f220..226c49f220 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Init16.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia16/Init16.asm
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm
index 146df600a6..146df600a6 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
index 142d9f3212..142d9f3212 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/Flat32ToFlat64.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia32/Flat32ToFlat64.asm
index 62e71da3d5..62e71da3d5 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia32/Flat32ToFlat64.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia32/Flat32ToFlat64.asm
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/PageTables64.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia32/PageTables64.asm
index 2e16e71f6a..2e16e71f6a 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia32/PageTables64.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia32/PageTables64.asm
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
index d0c2d8c39c..d0c2d8c39c 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForSecEntry.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForSecEntry.asm
index 6206b44485..6206b44485 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForSecEntry.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForSecEntry.asm
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Main.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/Main.asm
index ebfb9015d4..ebfb9015d4 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Main.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Main.asm
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Port80Debug.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/Port80Debug.asm
index 4b13c4860b..4b13c4860b 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Port80Debug.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Port80Debug.asm
diff --git a/UefiCpuPkg/ResetVector/Vtf0/PostCodes.inc b/Core/UefiCpuPkg/ResetVector/Vtf0/PostCodes.inc
index 62eda5d992..62eda5d992 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/PostCodes.inc
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/PostCodes.inc
diff --git a/UefiCpuPkg/ResetVector/Vtf0/ReadMe.txt b/Core/UefiCpuPkg/ResetVector/Vtf0/ReadMe.txt
index e6e5b54243..e6e5b54243 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/ReadMe.txt
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/ReadMe.txt
diff --git a/UefiCpuPkg/ResetVector/Vtf0/ResetVector.uni b/Core/UefiCpuPkg/ResetVector/Vtf0/ResetVector.uni
index 3fcc3f084c..3fcc3f084c 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/ResetVector.uni
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/ResetVector.uni
diff --git a/UefiCpuPkg/ResetVector/Vtf0/ResetVectorExtra.uni b/Core/UefiCpuPkg/ResetVector/Vtf0/ResetVectorExtra.uni
index f18a4f0443..f18a4f0443 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/ResetVectorExtra.uni
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/ResetVectorExtra.uni
diff --git a/UefiCpuPkg/ResetVector/Vtf0/SerialDebug.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/SerialDebug.asm
index ebd0910f4a..ebd0910f4a 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/SerialDebug.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/SerialDebug.asm
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py b/Core/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py
index a70ce7501d..a70ce7501d 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf b/Core/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf
index 41aba45a14..41aba45a14 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb b/Core/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb
index f4a29e8d89..f4a29e8d89 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb
diff --git a/UefiCpuPkg/ResetVector/Vtf0/X64/PageTables.asm b/Core/UefiCpuPkg/ResetVector/Vtf0/X64/PageTables.asm
index 3d703c74f6..3d703c74f6 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/X64/PageTables.asm
+++ b/Core/UefiCpuPkg/ResetVector/Vtf0/X64/PageTables.asm
diff --git a/UefiCpuPkg/SecCore/FindPeiCore.c b/Core/UefiCpuPkg/SecCore/FindPeiCore.c
index 60ccaa9667..60ccaa9667 100644
--- a/UefiCpuPkg/SecCore/FindPeiCore.c
+++ b/Core/UefiCpuPkg/SecCore/FindPeiCore.c
diff --git a/UefiCpuPkg/SecCore/Ia32/ResetVec.asm16 b/Core/UefiCpuPkg/SecCore/Ia32/ResetVec.asm16
index d90613c4d0..d90613c4d0 100644
--- a/UefiCpuPkg/SecCore/Ia32/ResetVec.asm16
+++ b/Core/UefiCpuPkg/SecCore/Ia32/ResetVec.asm16
diff --git a/UefiCpuPkg/SecCore/Ia32/ResetVec.nasmb b/Core/UefiCpuPkg/SecCore/Ia32/ResetVec.nasmb
index 2fcdc85e47..2fcdc85e47 100644
--- a/UefiCpuPkg/SecCore/Ia32/ResetVec.nasmb
+++ b/Core/UefiCpuPkg/SecCore/Ia32/ResetVec.nasmb
diff --git a/UefiCpuPkg/SecCore/SecBist.c b/Core/UefiCpuPkg/SecCore/SecBist.c
index a9d36acadb..a9d36acadb 100644
--- a/UefiCpuPkg/SecCore/SecBist.c
+++ b/Core/UefiCpuPkg/SecCore/SecBist.c
diff --git a/UefiCpuPkg/SecCore/SecCore.inf b/Core/UefiCpuPkg/SecCore/SecCore.inf
index 0d135e62ec..0d135e62ec 100644
--- a/UefiCpuPkg/SecCore/SecCore.inf
+++ b/Core/UefiCpuPkg/SecCore/SecCore.inf
diff --git a/UefiCpuPkg/SecCore/SecCore.uni b/Core/UefiCpuPkg/SecCore/SecCore.uni
index bd43c8b753..bd43c8b753 100644
--- a/UefiCpuPkg/SecCore/SecCore.uni
+++ b/Core/UefiCpuPkg/SecCore/SecCore.uni
diff --git a/UefiCpuPkg/SecCore/SecCoreExtra.uni b/Core/UefiCpuPkg/SecCore/SecCoreExtra.uni
index c4bd4da20e..c4bd4da20e 100644
--- a/UefiCpuPkg/SecCore/SecCoreExtra.uni
+++ b/Core/UefiCpuPkg/SecCore/SecCoreExtra.uni
diff --git a/UefiCpuPkg/SecCore/SecMain.c b/Core/UefiCpuPkg/SecCore/SecMain.c
index 077d0db49f..077d0db49f 100644
--- a/UefiCpuPkg/SecCore/SecMain.c
+++ b/Core/UefiCpuPkg/SecCore/SecMain.c
diff --git a/UefiCpuPkg/SecCore/SecMain.h b/Core/UefiCpuPkg/SecCore/SecMain.h
index 6e31a953f7..6e31a953f7 100644
--- a/UefiCpuPkg/SecCore/SecMain.h
+++ b/Core/UefiCpuPkg/SecCore/SecMain.h
diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/Core/UefiCpuPkg/UefiCpuPkg.dec
index 6f30ad032d..6f30ad032d 100644
--- a/UefiCpuPkg/UefiCpuPkg.dec
+++ b/Core/UefiCpuPkg/UefiCpuPkg.dec
diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/Core/UefiCpuPkg/UefiCpuPkg.dsc
index 1336b0cfc0..1336b0cfc0 100644
--- a/UefiCpuPkg/UefiCpuPkg.dsc
+++ b/Core/UefiCpuPkg/UefiCpuPkg.dsc
diff --git a/UefiCpuPkg/UefiCpuPkg.uni b/Core/UefiCpuPkg/UefiCpuPkg.uni
index cd0ecab611..cd0ecab611 100644
--- a/UefiCpuPkg/UefiCpuPkg.uni
+++ b/Core/UefiCpuPkg/UefiCpuPkg.uni
diff --git a/UefiCpuPkg/UefiCpuPkgExtra.uni b/Core/UefiCpuPkg/UefiCpuPkgExtra.uni
index 858761af24..858761af24 100644
--- a/UefiCpuPkg/UefiCpuPkgExtra.uni
+++ b/Core/UefiCpuPkg/UefiCpuPkgExtra.uni
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.S b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.S
index ede19f21c3..ede19f21c3 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.S
+++ b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.S
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.asm b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.asm
index 79496c48d7..79496c48d7 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.asm
+++ b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.asm
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.nasm b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.nasm
index fa5dda1466..fa5dda1466 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.nasm
+++ b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.nasm
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
index e53ed21bdc..e53ed21bdc 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
+++ b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index d514523089..d514523089 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.uni b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.uni
index 0f78a15173..0f78a15173 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.uni
+++ b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.uni
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2PeiExtra.uni b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2PeiExtra.uni
index 4d88423149..4d88423149 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2PeiExtra.uni
+++ b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2PeiExtra.uni
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.S b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.S
index 2ced09f35c..2ced09f35c 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.S
+++ b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.S
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.asm b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.asm
index eb014a5862..eb014a5862 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.asm
+++ b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.asm
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.nasm b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.nasm
index add73cacc0..add73cacc0 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.nasm
+++ b/Core/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.nasm