[coreboot-gerrit] Patch set updated for coreboot: 7e099ee vendorcode/amd/agesa/fam14: Clean #includes in public headers

Edward O'Callaghan (eocallaghan@alterapraxis.com) gerrit at coreboot.org
Sun Mar 30 17:23:40 CEST 2014


Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5428

-gerrit

commit 7e099eef3d0524814c9b670066d332d2eb815f22
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Sun Mar 30 16:43:36 2014 +1100

    vendorcode/amd/agesa/fam14: Clean #includes in public headers
    
    NOTFORMERGE
    
    Following the same reasoning as commit
    <HASH HERE> vendorcode/amd/agesa/fam15tn: Clean #includes in public headers
    Clean up the #include directives in this vendorcode.
    
    Change-Id: Ib520145d2b2f4b02939ea2a1ee750ab1cef1fe42
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 .../amd/agesa/f14/Include/OptionC6Install.h        | 12 +++----
 .../amd/agesa/f14/Include/OptionCpbInstall.h       | 12 +++----
 .../f14/Include/OptionCpuCacheFlushOnHaltInstall.h | 12 +++----
 .../amd/agesa/f14/Include/OptionDmiInstall.h       | 12 +++----
 .../amd/agesa/f14/Include/OptionGnbInstall.h       | 16 ++++-----
 .../amd/agesa/f14/Include/OptionHtAssistInstall.h  | 12 +++----
 .../amd/agesa/f14/Include/OptionHtInstall.h        | 20 +++++------
 .../amd/agesa/f14/Include/OptionHwC1eInstall.h     | 12 +++----
 .../amd/agesa/f14/Include/OptionIdsInstall.h       | 12 +++----
 .../amd/agesa/f14/Include/OptionIoCstateInstall.h  | 12 +++----
 .../agesa/f14/Include/OptionLowPwrPstateInstall.h  | 12 +++----
 .../amd/agesa/f14/Include/OptionMemory.h           | 20 +++++------
 .../amd/agesa/f14/Include/OptionMemoryRecovery.h   | 16 ++++-----
 .../agesa/f14/Include/OptionMsgBasedC1eInstall.h   | 12 +++----
 .../f14/Include/OptionPreserveMailboxInstall.h     | 12 +++----
 .../amd/agesa/f14/Include/OptionPstate.h           | 12 +++----
 .../amd/agesa/f14/Include/OptionPstateInstall.h    | 12 +++----
 .../amd/agesa/f14/Include/OptionS3ScriptInstall.h  | 12 +++----
 .../amd/agesa/f14/Include/OptionSwC1eInstall.h     | 12 +++----
 .../amd/agesa/f14/Legacy/Proc/Dispatcher.c         | 12 +++----
 .../amd/agesa/f14/Legacy/Proc/agesaCallouts.c      | 16 ++++-----
 .../amd/agesa/f14/Legacy/Proc/hobTransfer.c        | 26 +++++++-------
 src/vendorcode/amd/agesa/f14/Lib/amdlib.c          |  4 +--
 .../f14/Proc/CPU/Family/0x10/F10InitEarlyTable.c   |  4 +--
 .../agesa/f14/Proc/CPU/Family/0x10/F10IoCstate.c   | 14 ++++----
 .../Proc/CPU/Family/0x10/F10MultiLinkPciTables.c   |  4 +--
 .../f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c  | 10 +++---
 .../CPU/Family/0x10/F10PmDualPlaneOnlySupport.c    | 10 +++---
 .../f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c   | 10 +++---
 .../f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.c   |  8 ++---
 .../Proc/CPU/Family/0x10/F10SingleLinkPciTables.c  |  4 +--
 .../Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c    | 10 +++---
 .../Family/0x10/RevC/BL/F10BlEquivalenceTable.c    |  2 +-
 .../CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c     |  4 +--
 .../CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c |  2 +-
 .../0x10/RevC/BL/F10BlMicrocodePatchTables.c       |  6 ++--
 .../Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c  |  4 +--
 .../Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c  |  4 +--
 .../Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c    | 10 +++---
 .../Family/0x10/RevC/DA/F10DaEquivalenceTable.c    |  2 +-
 .../CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c     |  4 +--
 .../CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c |  2 +-
 .../0x10/RevC/DA/F10DaMicrocodePatchTables.c       |  6 ++--
 .../Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c  |  4 +--
 .../Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c  |  4 +--
 .../Family/0x10/RevC/F10MicrocodePatch01000085.c   |  4 +--
 .../Family/0x10/RevC/F10MicrocodePatch010000c6.c   |  4 +--
 .../Family/0x10/RevC/F10MicrocodePatch010000c7.c   |  4 +--
 .../Family/0x10/RevC/F10MicrocodePatch010000c8.c   |  4 +--
 .../Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c |  4 +--
 .../f14/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c   |  8 ++---
 .../Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c   |  4 +--
 .../Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c   |  4 +--
 .../f14/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c   |  6 ++--
 .../Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c   | 12 +++----
 .../Family/0x10/RevC/RB/F10RbEquivalenceTable.c    |  2 +-
 .../CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c     |  4 +--
 .../CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c |  2 +-
 .../0x10/RevC/RB/F10RbMicrocodePatchTables.c       |  6 ++--
 .../Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c  |  4 +--
 .../Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c  |  4 +--
 .../Family/0x10/RevD/F10MicrocodePatch010000c4.c   |  4 +--
 .../Family/0x10/RevD/F10MicrocodePatch010000c5.c   |  4 +--
 .../Proc/CPU/Family/0x10/RevD/F10RevDHtAssist.c    | 10 +++---
 .../Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c | 12 +++----
 .../Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c   | 10 +++---
 .../Family/0x10/RevD/HY/F10HyEquivalenceTable.c    |  2 +-
 .../CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c     |  4 +--
 .../CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c  |  8 ++---
 .../CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c |  2 +-
 .../0x10/RevD/HY/F10HyMicrocodePatchTables.c       |  6 ++--
 .../Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c  |  4 +--
 .../Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c  |  4 +--
 .../Family/0x10/RevE/F10MicrocodePatch010000bf.c   |  4 +--
 .../Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c |  4 +--
 .../Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c   |  4 +--
 .../Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c   |  4 +--
 .../Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c   | 10 +++---
 .../Family/0x10/RevE/PH/F10PhEquivalenceTable.c    |  2 +-
 .../CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c     |  4 +--
 .../CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c |  2 +-
 .../0x10/RevE/PH/F10PhMicrocodePatchTables.c       |  6 ++--
 .../Proc/CPU/Family/0x10/cpuCommonF10Utilities.c   |  8 ++---
 .../agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandId.c |  6 ++--
 .../f14/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c    |  4 +--
 .../f14/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c   |  4 +--
 .../f14/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c    |  4 +--
 .../f14/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c |  4 +--
 .../f14/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c    |  4 +--
 .../f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c   |  4 +--
 .../f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c   |  4 +--
 .../f14/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c |  4 +--
 .../Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c  | 10 +++---
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Cpb.c |  8 ++---
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Dmi.c | 12 +++----
 .../f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.c     | 10 +++---
 .../Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c   |  8 ++---
 .../f14/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c   |  4 +--
 .../f14/Proc/CPU/Family/0x10/cpuF10MsrTables.c     |  4 +--
 .../f14/Proc/CPU/Family/0x10/cpuF10PciTables.c     |  4 +--
 .../f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.c    | 10 +++---
 .../CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c  |  8 ++---
 .../f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.c    | 12 +++----
 .../agesa/f14/Proc/CPU/Family/0x10/cpuF10Pstate.c  | 20 +++++------
 .../Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c   |  6 ++--
 .../f14/Proc/CPU/Family/0x10/cpuF10Utilities.c     | 14 ++++----
 .../CPU/Family/0x10/cpuF10WheaInitDataTables.c     |  4 +--
 .../Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c  |  6 ++--
 .../agesa/f14/Proc/CPU/Family/0x14/F14C6State.c    | 20 +++++------
 .../agesa/f14/Proc/CPU/Family/0x14/F14IoCstate.c   | 26 +++++++-------
 .../CPU/Family/0x14/F14MicrocodePatch0500000B.c    | 14 ++++----
 .../CPU/Family/0x14/F14MicrocodePatch0500001A.c    | 14 ++++----
 .../CPU/Family/0x14/F14MicrocodePatch05000025.c    |  4 +--
 .../CPU/Family/0x14/F14MicrocodePatch05000028.c    | 14 ++++----
 .../CPU/Family/0x14/F14MicrocodePatch05000101.c    | 16 ++++-----
 .../agesa/f14/Proc/CPU/Family/0x14/ON/F14OnCpb.c   | 25 +++++++------
 .../CPU/Family/0x14/ON/F14OnEquivalenceTable.c     | 16 ++++-----
 .../Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c  | 20 +++++------
 .../Proc/CPU/Family/0x14/ON/F14OnLogicalIdTables.c | 12 +++----
 .../CPU/Family/0x14/ON/F14OnMicrocodePatchTables.c | 16 ++++-----
 .../f14/Proc/CPU/Family/0x14/ON/F14OnPciTables.c   | 14 ++++----
 .../Proc/CPU/Family/0x14/cpuCommonF14Utilities.c   | 24 ++++++-------
 .../agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandId.c | 16 ++++-----
 .../f14/Proc/CPU/Family/0x14/cpuF14BrandIdFt1.c    | 14 ++++----
 .../f14/Proc/CPU/Family/0x14/cpuF14CacheDefaults.c | 14 ++++----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Dmi.c | 20 +++++------
 .../f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.c  | 14 ++++----
 .../f14/Proc/CPU/Family/0x14/cpuF14MsrTables.c     | 14 ++++----
 .../f14/Proc/CPU/Family/0x14/cpuF14PciTables.c     |  4 +--
 .../Proc/CPU/Family/0x14/cpuF14PerCorePciTables.c  |  4 +--
 .../f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.c    | 12 +++----
 .../CPU/Family/0x14/cpuF14PowerMgmtSystemTables.c  |  8 ++---
 .../f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.c    | 14 ++++----
 .../agesa/f14/Proc/CPU/Family/0x14/cpuF14Pstate.c  |  8 ++---
 .../Proc/CPU/Family/0x14/cpuF14SoftwareThermal.c   |  6 ++--
 .../f14/Proc/CPU/Family/0x14/cpuF14Utilities.c     | 12 +++----
 .../CPU/Family/0x14/cpuF14WheaInitDataTables.c     |  4 +--
 .../agesa/f14/Proc/CPU/Feature/PreserveMailbox.c   | 14 ++++----
 .../amd/agesa/f14/Proc/CPU/Feature/cpuC6State.c    | 14 ++++----
 .../f14/Proc/CPU/Feature/cpuCacheFlushOnHalt.c     | 12 +++----
 .../amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.c  | 12 +++----
 .../agesa/f14/Proc/CPU/Feature/cpuCoreLeveling.c   | 14 ++++----
 .../amd/agesa/f14/Proc/CPU/Feature/cpuCpb.c        |  4 +--
 .../amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c        | 12 +++----
 .../f14/Proc/CPU/Feature/cpuFeatureLeveling.c      | 12 +++----
 .../amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.c   |  4 +--
 .../amd/agesa/f14/Proc/CPU/Feature/cpuHtAssist.c   | 12 +++----
 .../amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.c      | 12 +++----
 .../amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.c   | 10 +++---
 .../agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.c   |  8 ++---
 .../agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.c    | 12 +++----
 .../agesa/f14/Proc/CPU/Feature/cpuPstateGather.c   | 16 ++++-----
 .../agesa/f14/Proc/CPU/Feature/cpuPstateLeveling.c | 16 ++++-----
 .../agesa/f14/Proc/CPU/Feature/cpuPstateTables.c   | 16 ++++-----
 .../amd/agesa/f14/Proc/CPU/Feature/cpuSlit.c       | 10 +++---
 .../amd/agesa/f14/Proc/CPU/Feature/cpuSrat.c       | 10 +++---
 .../amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.c      | 12 +++----
 .../amd/agesa/f14/Proc/CPU/Feature/cpuWhea.c       | 10 +++---
 src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c         | 12 +++----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Table.c      | 12 +++----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cahalt.c     |  2 +-
 .../amd/agesa/f14/Proc/CPU/cpuApicUtilities.c      | 14 ++++----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBist.c    |  8 ++---
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBrandId.c | 12 +++----
 .../amd/agesa/f14/Proc/CPU/cpuEarlyInit.c          | 16 ++++-----
 .../amd/agesa/f14/Proc/CPU/cpuEventLog.c           |  4 +--
 .../amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.c  |  6 ++--
 .../amd/agesa/f14/Proc/CPU/cpuGeneralServices.c    | 12 +++----
 .../amd/agesa/f14/Proc/CPU/cpuInitEarlyTable.c     |  4 +--
 .../amd/agesa/f14/Proc/CPU/cpuLateInit.c           |  8 ++---
 .../amd/agesa/f14/Proc/CPU/cpuMicrocodePatch.c     | 10 +++---
 .../amd/agesa/f14/Proc/CPU/cpuPostInit.c           | 18 +++++-----
 .../amd/agesa/f14/Proc/CPU/cpuPowerMgmt.c          | 14 ++++----
 .../agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.c   | 12 +++----
 .../agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.c  | 10 +++---
 .../amd/agesa/f14/Proc/CPU/cpuRegisters.h          | 12 +++----
 .../amd/agesa/f14/Proc/CPU/cpuWarmReset.c          |  8 ++---
 .../amd/agesa/f14/Proc/CPU/heapManager.c           | 12 +++----
 .../amd/agesa/f14/Proc/Common/AmdInitEarly.c       | 12 +++----
 .../amd/agesa/f14/Proc/Common/AmdInitEnv.c         |  6 ++--
 .../amd/agesa/f14/Proc/Common/AmdInitLate.c        |  6 ++--
 .../amd/agesa/f14/Proc/Common/AmdInitMid.c         |  2 +-
 .../amd/agesa/f14/Proc/Common/AmdInitPost.c        | 14 ++++----
 .../amd/agesa/f14/Proc/Common/AmdInitRecovery.c    |  8 ++---
 .../amd/agesa/f14/Proc/Common/AmdInitReset.c       |  6 ++--
 .../amd/agesa/f14/Proc/Common/AmdInitResume.c      | 18 +++++-----
 .../amd/agesa/f14/Proc/Common/AmdS3LateRestore.c   |  8 ++---
 .../amd/agesa/f14/Proc/Common/AmdS3Save.c          | 12 +++----
 .../amd/agesa/f14/Proc/Common/CommonInits.c        |  2 +-
 .../amd/agesa/f14/Proc/Common/CreateStruct.c       |  6 ++--
 .../amd/agesa/f14/Proc/Common/S3RestoreState.c     |  6 ++--
 .../amd/agesa/f14/Proc/Common/S3SaveState.c        |  6 ++--
 .../amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.c |  4 +--
 .../f14/Proc/GNB/Gfx/Family/0x14/F14GfxServices.c  | 41 +++++++++++-----------
 .../amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.c     | 10 +++---
 .../amd/agesa/f14/Proc/GNB/Gfx/GfxGmcInit.c        | 20 +++++------
 .../amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtEnvPost.c  |  6 ++--
 .../amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtMidPost.c  | 12 +++----
 .../amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtPost.c     | 12 +++----
 .../f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c  | 26 +++++++-------
 src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.c | 14 ++++----
 .../amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.c    | 10 +++---
 .../amd/agesa/f14/Proc/GNB/Gfx/GfxStrapsInit.c     | 16 ++++-----
 .../amd/agesa/f14/Proc/GNB/GnbInitAtEarly.c        |  4 +--
 .../amd/agesa/f14/Proc/GNB/GnbInitAtEnv.c          |  4 +--
 .../amd/agesa/f14/Proc/GNB/GnbInitAtLate.c         |  4 +--
 .../amd/agesa/f14/Proc/GNB/GnbInitAtMid.c          |  4 +--
 .../amd/agesa/f14/Proc/GNB/GnbInitAtPost.c         |  4 +--
 .../amd/agesa/f14/Proc/GNB/GnbInitAtReset.c        |  2 +-
 .../Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c   | 12 +++----
 .../f14/Proc/GNB/Modules/GnbCommonLib/GnbLib.c     |  4 +--
 .../f14/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c |  2 +-
 .../Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c    |  4 +--
 .../Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c   |  4 +--
 .../f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPci.c  |  2 +-
 .../Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c   |  4 +--
 .../Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c   | 10 +++---
 .../Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c  |  8 ++---
 .../Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c |  6 ++--
 .../Modules/GnbGfxInitLibV1/GfxEnumConnectors.c    | 12 +++----
 .../Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c    | 16 ++++-----
 .../GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.h  | 12 +++----
 .../GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c    |  6 ++--
 .../f14/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c  | 18 +++++-----
 .../GNB/Modules/GnbPcieConfig/PcieConfigData.c     | 10 +++---
 .../Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c |  8 ++---
 .../GNB/Modules/GnbPcieConfig/PcieInputParser.c    |  4 +--
 .../GNB/Modules/GnbPcieConfig/PcieMapTopology.c    |  8 ++---
 .../Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c   |  4 +--
 .../Modules/GnbPcieInitLibV1/PcieAspmBlackList.c   |  4 +--
 .../Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c |  4 +--
 .../GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c |  8 ++---
 .../GNB/Modules/GnbPcieInitLibV1/PciePifServices.c |  8 ++---
 .../GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c  |  6 ++--
 .../Modules/GnbPcieInitLibV1/PciePortServices.c    |  8 ++---
 .../GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c   |  8 ++---
 .../Proc/GNB/Modules/GnbPcieInitLibV1/PcieSbLink.c |  8 ++---
 .../Modules/GnbPcieInitLibV1/PcieSiliconServices.c |  8 ++---
 .../Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c  |  8 ++---
 .../GnbPcieInitLibV1/PcieTopologyServices.c        | 10 +++---
 .../GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c  |  8 ++---
 .../Modules/GnbPcieInitLibV1/PcieWrapperRegAcc.c   |  6 ++--
 .../GNB/Modules/GnbPcieTrainingV1/PcieTraining.c   |  8 ++---
 .../Modules/GnbPcieTrainingV1/PcieWorkarounds.c    |  8 ++---
 .../f14/Proc/GNB/Nb/Family/0x14/F14NbLclkDpm.c     | 22 ++++++------
 .../Proc/GNB/Nb/Family/0x14/F14NbLclkNclkRatio.c   | 12 +++----
 .../f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.c   | 22 ++++++------
 .../f14/Proc/GNB/Nb/Family/0x14/F14NbServices.c    | 22 ++++++------
 .../agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmu.c   |  6 ++--
 .../agesa/f14/Proc/GNB/Nb/Feature/NbFuseTable.c    | 18 +++++-----
 .../amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.c  | 20 +++++------
 .../amd/agesa/f14/Proc/GNB/Nb/NbConfigData.c       |  6 ++--
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInit.c  | 12 +++----
 .../amd/agesa/f14/Proc/GNB/Nb/NbInitAtEarly.c      |  6 ++--
 .../amd/agesa/f14/Proc/GNB/Nb/NbInitAtEnv.c        | 10 +++---
 .../amd/agesa/f14/Proc/GNB/Nb/NbInitAtLatePost.c   |  8 ++---
 .../amd/agesa/f14/Proc/GNB/Nb/NbInitAtPost.c       |  6 ++--
 .../amd/agesa/f14/Proc/GNB/Nb/NbInitAtReset.c      |  4 +--
 .../amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.c        | 18 +++++-----
 .../amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.c           | 10 +++---
 .../f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlib.c    | 12 +++----
 .../GNB/PCIe/Family/0x14/F14PcieComplexConfig.c    |  8 ++---
 .../GNB/PCIe/Family/0x14/F14PcieComplexServices.c  | 12 +++----
 .../Proc/GNB/PCIe/Family/0x14/F14PciePhyServices.c |  6 ++--
 .../Proc/GNB/PCIe/Family/0x14/F14PciePifServices.c |  8 ++---
 .../GNB/PCIe/Family/0x14/F14PcieWrapperServices.c  | 14 ++++----
 .../f14/Proc/GNB/PCIe/Feature/PciePowerGate.c      | 10 +++---
 .../amd/agesa/f14/Proc/GNB/PCIe/PcieInit.c         | 12 +++----
 .../agesa/f14/Proc/GNB/PCIe/PcieInitAtEarlyPost.c  |  4 +--
 .../amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEnv.c    |  6 ++--
 .../agesa/f14/Proc/GNB/PCIe/PcieInitAtLatePost.c   |  4 +--
 .../amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtPost.c   |  4 +--
 .../amd/agesa/f14/Proc/GNB/PCIe/PcieLateInit.c     |  8 ++---
 .../amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.c      | 10 +++---
 .../amd/agesa/f14/Proc/GNB/PCIe/PciePortInit.c     | 10 +++---
 .../amd/agesa/f14/Proc/GNB/PCIe/PciePortLateInit.c | 10 +++---
 .../agesa/f14/Proc/HT/Fam10/htNbCoherentFam10.c    |  8 ++---
 .../amd/agesa/f14/Proc/HT/Fam10/htNbFam10.c        | 18 +++++-----
 .../agesa/f14/Proc/HT/Fam10/htNbNonCoherentFam10.c |  8 ++---
 .../f14/Proc/HT/Fam10/htNbOptimizationFam10.c      |  4 +--
 .../amd/agesa/f14/Proc/HT/Fam10/htNbSystemFam10.c  |  8 ++---
 .../agesa/f14/Proc/HT/Fam10/htNbUtilitiesFam10.c   |  8 ++---
 .../amd/agesa/f14/Proc/HT/Fam14/htNbFam14.c        | 18 +++++-----
 .../agesa/f14/Proc/HT/Fam14/htNbUtilitiesFam14.c   |  8 ++---
 .../f14/Proc/HT/Features/htFeatDynamicDiscovery.c  |  4 +--
 .../amd/agesa/f14/Proc/HT/Features/htFeatGanging.c |  6 ++--
 .../agesa/f14/Proc/HT/Features/htFeatNoncoherent.c |  6 ++--
 .../f14/Proc/HT/Features/htFeatOptimization.c      |  6 ++--
 .../amd/agesa/f14/Proc/HT/Features/htFeatRouting.c |  4 +--
 .../amd/agesa/f14/Proc/HT/Features/htFeatSets.c    |  4 +--
 .../agesa/f14/Proc/HT/Features/htFeatSublinks.c    |  4 +--
 .../Proc/HT/Features/htFeatTrafficDistribution.c   |  6 ++--
 .../amd/agesa/f14/Proc/HT/Features/htIds.c         |  8 ++---
 .../amd/agesa/f14/Proc/HT/NbCommon/htNbCoherent.c  |  8 ++---
 .../agesa/f14/Proc/HT/NbCommon/htNbNonCoherent.c   |  8 ++---
 .../agesa/f14/Proc/HT/NbCommon/htNbOptimization.c  |  8 ++---
 .../amd/agesa/f14/Proc/HT/NbCommon/htNbUtilities.c |  8 ++---
 src/vendorcode/amd/agesa/f14/Proc/HT/htFeat.c      |  4 +--
 src/vendorcode/amd/agesa/f14/Proc/HT/htInterface.c |  4 +--
 .../amd/agesa/f14/Proc/HT/htInterfaceCoherent.c    |  8 ++---
 .../amd/agesa/f14/Proc/HT/htInterfaceGeneral.c     | 12 +++----
 .../amd/agesa/f14/Proc/HT/htInterfaceNonCoherent.c |  6 ++--
 src/vendorcode/amd/agesa/f14/Proc/HT/htMain.c      | 10 +++---
 src/vendorcode/amd/agesa/f14/Proc/HT/htNb.c        | 24 ++++++-------
 src/vendorcode/amd/agesa/f14/Proc/HT/htNotify.c    |  4 +--
 src/vendorcode/amd/agesa/f14/Proc/IDS/IdsLib.h     | 16 ++++-----
 .../amd/agesa/f14/Proc/Mem/Ardk/C32/marc32_3.c     |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Ardk/C32/mauc32_3.c     |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Ardk/DA/masda2.c        |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Ardk/DA/masda3.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Ardk/DA/mauda3.c        |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Ardk/DR/mardr2.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Ardk/DR/mardr3.c        |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Ardk/DR/maudr3.c        |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Ardk/HY/marhy3.c        |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Ardk/HY/mauhy3.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Ardk/NI/masNi3.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Ardk/NI/mauNi3.c        |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Ardk/ON/mason3.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Ardk/ON/mauon3.c        |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Ardk/PH/masph3.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Ardk/PH/mauPh3.c        |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Ardk/RB/masRb3.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Ardk/RB/mauRb3.c        |  6 ++--
 src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ma.c    |  2 +-
 .../amd/agesa/f14/Proc/Mem/Feat/CHINTLV/mfchi.c    |  4 +--
 .../amd/agesa/f14/Proc/Mem/Feat/CSINTLV/mfcsi.c    |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Feat/DMI/mfDMI.c        | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Feat/ECC/mfecc.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Feat/ECC/mfemp.c        |  4 +--
 .../f14/Proc/Mem/Feat/EXCLUDIMM/mfdimmexclud.c     |  6 ++--
 .../agesa/f14/Proc/Mem/Feat/IDENDIMM/mfidendimm.c  |  8 ++---
 .../agesa/f14/Proc/Mem/Feat/INTLVRN/mfintlvrn.c    |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Feat/LVDDR3/mflvddr3.c  |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Feat/MEMCLR/mfmemclr.c  |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Feat/NDINTLV/mfndi.c    |  6 ++--
 .../f14/Proc/Mem/Feat/ODTHERMAL/mfodthermal.c      |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Feat/OLSPARE/mfspr.c    |  6 ++--
 .../f14/Proc/Mem/Feat/PARTRN/mfParallelTraining.c  | 14 ++++----
 .../f14/Proc/Mem/Feat/PARTRN/mfStandardTraining.c  |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Feat/S3/mfs3.c          | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/Feat/TABLE/mftds.c      | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Main/C32/mmflowC32.c    | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Main/DA/mmflowda.c      | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Main/DR/mmflowdr.c      | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Main/HY/mmflowhy.c      | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Main/ON/mmflowon.c      | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Main/PH/mmflowPh.c      | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Main/RB/mmflowRb.c      | 10 +++---
 src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mdef.c  |  2 +-
 .../amd/agesa/f14/Proc/Mem/Main/merrhdl.c          | 12 +++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/Main/minit.c |  6 ++--
 src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mm.c    | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Main/mmConditionalPso.c |  2 +-
 src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmEcc.c | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Main/mmExcludeDimm.c    |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Main/mmLvDdr3.c         |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Main/mmMemClr.c         |  6 ++--
 .../amd/agesa/f14/Proc/Mem/Main/mmMemRestore.c     | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Main/mmNodeInterleave.c |  4 +--
 .../amd/agesa/f14/Proc/Mem/Main/mmOnlineSpare.c    |  4 +--
 .../agesa/f14/Proc/Mem/Main/mmParallelTraining.c   | 24 ++++++-------
 .../agesa/f14/Proc/Mem/Main/mmStandardTraining.c   | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Main/mmUmaAlloc.c       | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Main/mmflow.c           | 18 +++++-----
 src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mu.c    |  4 +--
 src/vendorcode/amd/agesa/f14/Proc/Mem/Main/muc.c   | 12 +++----
 .../amd/agesa/f14/Proc/Mem/NB/C32/mnParTrainc32.c  | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/C32/mnS3c32.c        | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/C32/mnc32.c          | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/C32/mndctc32.c       | 12 +++----
 .../amd/agesa/f14/Proc/Mem/NB/C32/mnflowc32.c      |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/C32/mnidendimmc32.c  | 10 +++---
 .../amd/agesa/f14/Proc/Mem/NB/C32/mnmctc32.c       |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/C32/mnotc32.c        |  4 +--
 .../amd/agesa/f14/Proc/Mem/NB/C32/mnphyc32.c       | 10 +++---
 .../amd/agesa/f14/Proc/Mem/NB/C32/mnregc32.c       | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/NB/DA/mnParTrainDa.c    | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/DA/mnS3da.c          | 18 +++++-----
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnda.c | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/DA/mndctda.c         | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/DA/mnflowda.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/DA/mnidendimmda.c    | 10 +++---
 .../amd/agesa/f14/Proc/Mem/NB/DA/mnmctda.c         |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/DA/mnotda.c          |  4 +--
 .../amd/agesa/f14/Proc/Mem/NB/DA/mnprotoda.c       |  4 +--
 .../amd/agesa/f14/Proc/Mem/NB/DA/mnregda.c         | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/NB/DR/mnParTrainDr.c    | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/DR/mnS3dr.c          | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/DR/mndctdr.c         | 16 ++++-----
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mndr.c | 20 +++++------
 .../amd/agesa/f14/Proc/Mem/NB/DR/mnflowdr.c        | 10 +++---
 .../amd/agesa/f14/Proc/Mem/NB/DR/mnidendimmdr.c    | 10 +++---
 .../amd/agesa/f14/Proc/Mem/NB/DR/mnmctdr.c         | 10 +++---
 .../amd/agesa/f14/Proc/Mem/NB/DR/mnotdr.c          |  4 +--
 .../amd/agesa/f14/Proc/Mem/NB/DR/mnprotodr.c       |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/DR/mnregdr.c         | 16 ++++-----
 .../amd/agesa/f14/Proc/Mem/NB/HY/mnParTrainHy.c    | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/HY/mnS3hy.c          | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/HY/mndcthy.c         | 12 +++----
 .../amd/agesa/f14/Proc/Mem/NB/HY/mnflowhy.c        |  8 ++---
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnhy.c | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/HY/mnidendimmhy.c    | 10 +++---
 .../amd/agesa/f14/Proc/Mem/NB/HY/mnmcthy.c         |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/HY/mnothy.c          |  4 +--
 .../amd/agesa/f14/Proc/Mem/NB/HY/mnphyhy.c         | 12 +++----
 .../amd/agesa/f14/Proc/Mem/NB/HY/mnreghy.c         | 14 ++++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnNi.c | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/NI/mnS3Ni.c          | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/NI/mnflowNi.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/ON/mnS3on.c          | 22 ++++++------
 .../amd/agesa/f14/Proc/Mem/NB/ON/mndcton.c         | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/ON/mnflowon.c        | 12 +++----
 .../amd/agesa/f14/Proc/Mem/NB/ON/mnidendimmon.c    | 12 +++----
 .../amd/agesa/f14/Proc/Mem/NB/ON/mnmcton.c         | 12 +++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.c | 22 ++++++------
 .../amd/agesa/f14/Proc/Mem/NB/ON/mnoton.c          |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/ON/mnphyon.c         | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/NB/ON/mnprotoon.c       |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/ON/mnregon.c         | 18 +++++-----
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnPh.c | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/PH/mnS3Ph.c          | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/PH/mnflowPh.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/PH/mnidendimmPh.c    | 10 +++---
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnRb.c | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/RB/mnS3Rb.c          | 18 +++++-----
 .../amd/agesa/f14/Proc/Mem/NB/RB/mnflowRb.c        |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/RB/mnidendimmRb.c    | 10 +++---
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mn.c      | 10 +++---
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnS3.c    | 14 ++++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mndct.c   | 16 ++++-----
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnfeat.c  | 10 +++---
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnflow.c  | 10 +++---
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnmct.c   | 14 ++++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnphy.c   | 16 ++++-----
 src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnreg.c   |  8 ++---
 .../amd/agesa/f14/Proc/Mem/NB/mntrain2.c           | 10 +++---
 .../amd/agesa/f14/Proc/Mem/NB/mntrain3.c           | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Ps/C32/mprc32_3.c       | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/C32/mpuc32_3.c       | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Ps/DA/mpsda2.c          | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Ps/DA/mpsda3.c          | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/DA/mpuda3.c          | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/DR/mprdr2.c          | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Ps/DR/mprdr3.c          | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/DR/mpsdr3.c          | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/DR/mpudr2.c          | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Ps/DR/mpudr3.c          | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Ps/HY/mprhy3.c          | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/HY/mpshy3.c          | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/HY/mpuhy3.c          | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Ps/NI/mpsNi3.c          | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/NI/mpuNi3.c          | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/ON/mpson3.c          | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Ps/ON/mpuon3.c          | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Ps/PH/mpsph3.c          | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/PH/mpuph3.c          | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/RB/mpsRb3.c          | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Ps/RB/mpuRb3.c          | 14 ++++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mp.c      | 12 +++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplribt.c | 12 +++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplrnlr.c |  8 ++---
 src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplrnpr.c |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Ps/mpmaxfreq.c          | 12 +++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpmr0.c   |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Ps/mpodtpat.c           | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Ps/mprc10opspd.c        | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Ps/mprc2ibt.c           | 12 +++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprtt.c   | 12 +++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpsao.c   | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Tech/DDR2/mt2.c         | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Tech/DDR2/mtot2.c       |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Tech/DDR2/mtspd2.c      | 14 ++++----
 .../amd/agesa/f14/Proc/Mem/Tech/DDR3/mt3.c         |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Tech/DDR3/mtlrdimm3.c   | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Tech/DDR3/mtot3.c       |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Tech/DDR3/mtrci3.c      | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Tech/DDR3/mtsdi3.c      | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Tech/DDR3/mtspd3.c      | 12 +++----
 .../amd/agesa/f14/Proc/Mem/Tech/DDR3/mttecc3.c     |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Tech/DDR3/mttwl3.c      | 10 +++---
 src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mt.c    | 12 +++----
 src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mthdi.c |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Tech/mttEdgeDetect.c    | 16 ++++-----
 .../amd/agesa/f14/Proc/Mem/Tech/mttdimbt.c         | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Tech/mttecc.c           |  8 ++---
 .../amd/agesa/f14/Proc/Mem/Tech/mtthrc.c           | 10 +++---
 src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttml.c | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Tech/mttoptsrc.c        | 10 +++---
 .../amd/agesa/f14/Proc/Mem/Tech/mttsrc.c           | 10 +++---
 .../amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.c  |  6 ++--
 .../amd/agesa/f14/Proc/Recovery/GNB/GnbRecovery.c  |  2 +-
 .../agesa/f14/Proc/Recovery/GNB/NbInitRecovery.c   |  6 ++--
 .../agesa/f14/Proc/Recovery/HT/htInitRecovery.c    |  2 +-
 .../amd/agesa/f14/Proc/Recovery/HT/htInitReset.c   |  2 +-
 .../agesa/f14/Proc/Recovery/Mem/NB/C32/mrnc32.c    | 14 ++++----
 .../agesa/f14/Proc/Recovery/Mem/NB/C32/mrnmctc32.c |  6 ++--
 .../amd/agesa/f14/Proc/Recovery/Mem/NB/DA/mrnda.c  | 14 ++++----
 .../agesa/f14/Proc/Recovery/Mem/NB/DA/mrnmctda.c   |  6 ++--
 .../amd/agesa/f14/Proc/Recovery/Mem/NB/DR/mrndr.c  | 14 ++++----
 .../agesa/f14/Proc/Recovery/Mem/NB/DR/mrnmctdr.c   |  8 ++---
 .../agesa/f14/Proc/Recovery/Mem/NB/HY/mrndcthy.c   |  6 ++--
 .../amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrnhy.c  | 14 ++++----
 .../agesa/f14/Proc/Recovery/Mem/NB/HY/mrnmcthy.c   |  6 ++--
 .../amd/agesa/f14/Proc/Recovery/Mem/NB/NI/mrnNi.c  | 14 ++++----
 .../agesa/f14/Proc/Recovery/Mem/NB/ON/mrndcton.c   | 12 +++----
 .../agesa/f14/Proc/Recovery/Mem/NB/ON/mrnmcton.c   |  8 ++---
 .../amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnon.c  | 14 ++++----
 .../amd/agesa/f14/Proc/Recovery/Mem/NB/PH/mrnPh.c  | 14 ++++----
 .../amd/agesa/f14/Proc/Recovery/Mem/NB/RB/mrnRb.c  | 14 ++++----
 .../amd/agesa/f14/Proc/Recovery/Mem/NB/mrn.c       | 12 +++----
 .../amd/agesa/f14/Proc/Recovery/Mem/NB/mrndct.c    | 10 +++---
 .../amd/agesa/f14/Proc/Recovery/Mem/NB/mrnmct.c    | 12 +++----
 .../amd/agesa/f14/Proc/Recovery/Mem/NB/mrntrain3.c |  8 ++---
 .../amd/agesa/f14/Proc/Recovery/Mem/Ps/mrp.c       | 10 +++---
 .../amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplribt.c  |  8 ++---
 .../amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplrnlr.c  |  6 ++--
 .../amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplrnpr.c  |  6 ++--
 .../amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpmr0.c    |  8 ++---
 .../amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpodtpat.c | 10 +++---
 .../agesa/f14/Proc/Recovery/Mem/Ps/mrprc10opspd.c  | 10 +++---
 .../amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprc2ibt.c | 10 +++---
 .../amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprtt.c    | 10 +++---
 .../amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpsao.c    | 10 +++---
 .../agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrt3.c   |  8 ++---
 .../f14/Proc/Recovery/Mem/Tech/DDR3/mrtrci3.c      |  6 ++--
 .../f14/Proc/Recovery/Mem/Tech/DDR3/mrtsdi3.c      |  6 ++--
 .../f14/Proc/Recovery/Mem/Tech/DDR3/mrtspd3.c      |  8 ++---
 .../f14/Proc/Recovery/Mem/Tech/DDR3/mrttwl3.c      |  6 ++--
 .../amd/agesa/f14/Proc/Recovery/Mem/Tech/mrtthrc.c |  8 ++---
 .../amd/agesa/f14/Proc/Recovery/Mem/Tech/mrttpos.c |  8 ++---
 .../amd/agesa/f14/Proc/Recovery/Mem/Tech/mrttsrc.c |  8 ++---
 .../amd/agesa/f14/Proc/Recovery/Mem/mrinit.c       |  4 +--
 .../amd/agesa/f14/Proc/Recovery/Mem/mrm.c          | 12 +++----
 .../amd/agesa/f14/Proc/Recovery/Mem/mruc.c         |  2 +-
 535 files changed, 2607 insertions(+), 2609 deletions(-)

diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionC6Install.h b/src/vendorcode/amd/agesa/f14/Include/OptionC6Install.h
index a7cc69f..082eb33 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionC6Install.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionC6Install.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_C6_STATE_INSTALL_H_
 #define _OPTION_C6_STATE_INSTALL_H_
 
-#include "cpuC6State.h"
+#include <Proc/CPU/Feature/cpuC6State.h>
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionCpbInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionCpbInstall.h
index f377a8e..4e1eedc 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionCpbInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionCpbInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_CPB_INSTALL_H_
 #define _OPTION_CPB_INSTALL_H_
 
-#include "cpuCpb.h"
+#include <Proc/CPU/Feature/cpuCpb.h>
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionCpuCacheFlushOnHaltInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionCpuCacheFlushOnHaltInstall.h
index 87aea08..aa27a22 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionCpuCacheFlushOnHaltInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionCpuCacheFlushOnHaltInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_CPU_CACHEFLUSHONHALT_INSTALL_H_
 #define _OPTION_CPU_CACHEFLUSHONHALT_INSTALL_H_
 
-#include "cpuPostInit.h"
+#include "Proc/CPU/cpuPostInit.h"
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionDmiInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionDmiInstall.h
index 87f27e7..bbf8148 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionDmiInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionDmiInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_DMI_INSTALL_H_
 #define _OPTION_DMI_INSTALL_H_
 
-#include "cpuLateInit.h"
+#include <Proc/CPU/cpuLateInit.h>
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionGnbInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionGnbInstall.h
index db47302..af79402 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionGnbInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionGnbInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_GNB_INSTALL_H_
 #define _OPTION_GNB_INSTALL_H_
 
-#include "S3SaveState.h"
+#include <Proc/Common/S3SaveState.h>
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
  *  Check to validate the definition
@@ -58,8 +58,8 @@
 #define GNB_TYPE_KR FALSE
 #define GNB_TYPE_TN FALSE
 
-#include "Gnb.h"
-#include "GnbPcie.h"
+#include <Proc/GNB/Common/Gnb.h>
+#include <Proc/GNB/Common/GnbPcie.h>
 
 #ifndef CFG_IGFX_AS_PCIE_EP
   #define CFG_IGFX_AS_PCIE_EP     TRUE
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionHtAssistInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionHtAssistInstall.h
index 171e9ea..7899e9d 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionHtAssistInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionHtAssistInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_HT_ASSIST_INSTALL_H_
 #define _OPTION_HT_ASSIST_INSTALL_H_
 
-#include "cpuHtAssist.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHtAssist.h>
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionHtInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionHtInstall.h
index 637f069..f17385e 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionHtInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionHtInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,11 +47,11 @@
 #ifndef _OPTION_HT_INSTALL_H_
 #define _OPTION_HT_INSTALL_H_
 
-#include "Topology.h"
-#include "htFeat.h"
-#include "htInterface.h"
-#include "htNb.h"
-#include "htTopologies.h"
+#include <Proc/HT/htFeat.h>
+#include <Proc/HT/htInterface.h>
+#include <Proc/HT/htNb.h>
+#include <Proc/HT/htTopologies.h>
+#include <vendorcode/amd/agesa/f14/Include/Topology.h>
 /*
  * Advanced Option only, hardware socket naming is the preferred method.
  */
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionHwC1eInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionHwC1eInstall.h
index 745914f..5be2e0f 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionHwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionHwC1eInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_HW_C1E_INSTALL_H_
 #define _OPTION_HW_C1E_INSTALL_H_
 
-#include "cpuHwC1e.h"
+#include <Proc/CPU/Feature/cpuHwC1e.h>
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionIdsInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionIdsInstall.h
index 11de68e..9751221 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionIdsInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionIdsInstall.h
@@ -16,7 +16,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -24,10 +24,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -38,7 +38,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -46,7 +46,7 @@
 #define _OPTION_IDS_INSTALL_H_
 #include "Ids.h"
 #include "IdsHt.h"
-#include "IdsLib.h"
+#include <Proc/IDS/IdsLib.h>
 #ifdef __IDS_EXTENDED__
   #include OPTION_IDS_EXT_INSTALL_FILE
 #endif
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionIoCstateInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionIoCstateInstall.h
index f15682f..0907e95 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionIoCstateInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionIoCstateInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_IO_CSTATE_INSTALL_H_
 #define _OPTION_IO_CSTATE_INSTALL_H_
 
-#include "cpuIoCstate.h"
+#include <Proc/CPU/Feature/cpuIoCstate.h>
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionLowPwrPstateInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionLowPwrPstateInstall.h
index 6e03fea..727270a 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionLowPwrPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionLowPwrPstateInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_LOW_PWR_PSTATE_INSTALL_H_
 #define _OPTION_LOW_PWR_PSTATE_INSTALL_H_
 
-#include "cpuLowPwrPstate.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.h>
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionMemory.h b/src/vendorcode/amd/agesa/f14/Include/OptionMemory.h
index a753c6d..7186445 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionMemory.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionMemory.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -48,11 +48,11 @@
 #define _OPTION_MEMORY_H_
 
 /* Memory Includes */
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "ma.h"
-#include "mp.h"
+#include <Proc/Mem/mm.h>
+#include <Proc/Mem/mn.h>
+#include <Proc/Mem/mt.h>
+#include <Proc/Mem/ma.h>
+#include <Proc/Mem/mp.h>
 /*----------------------------------------------------------------------------------------
  *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionMemoryRecovery.h b/src/vendorcode/amd/agesa/f14/Include/OptionMemoryRecovery.h
index 443a3ca..cddcd91 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionMemoryRecovery.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionMemoryRecovery.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,9 +47,9 @@
 #ifndef _OPTION_MEMORY_RECOVERY_H_
 #define _OPTION_MEMORY_RECOVERY_H_
 
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <Proc/Mem/mm.h>
+#include <Proc/Mem/mn.h>
+#include <Proc/Mem/mt.h>
 
 typedef BOOLEAN MEM_REC_NB_CONSTRUCTOR (
   IN OUT   MEM_NB_BLOCK *NBPtr,
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionMsgBasedC1eInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionMsgBasedC1eInstall.h
index b1d91d9..48ffcdb 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionMsgBasedC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionMsgBasedC1eInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_MSG_BASED_C1E_INSTALL_H_
 #define _OPTION_MSG_BASED_C1E_INSTALL_H_
 
-#include "cpuMsgBasedC1e.h"
+#include <Proc/CPU/Feature/cpuMsgBasedC1e.h>
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionPreserveMailboxInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionPreserveMailboxInstall.h
index bd7d3f4..af71a72 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionPreserveMailboxInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionPreserveMailboxInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_PRESERVE_MAILBOX_INSTALL_H_
 #define _OPTION_PRESERVE_MAILBOX_INSTALL_H_
 
-#include "PreserveMailbox.h"
+#include <Proc/CPU/Feature/PreserveMailbox.h>
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionPstate.h b/src/vendorcode/amd/agesa/f14/Include/OptionPstate.h
index 27e1478..55e86ea 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionPstate.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionPstate.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_PSTATE_H_
 #define _OPTION_PSTATE_H_
 
-#include "cpuPstateTables.h"
+#include <Proc/CPU/Feature/cpuPstateTables.h>
 
 /*----------------------------------------------------------------------------------------
  *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionPstateInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionPstateInstall.h
index b289910..82b10b6 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionPstateInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_PSTATE_INSTALL_H_
 #define _OPTION_PSTATE_INSTALL_H_
 
-#include "cpuPstateTables.h"
+#include <Proc/CPU/Feature/cpuPstateTables.h>
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionS3ScriptInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionS3ScriptInstall.h
index 2804cae..74345c2 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionS3ScriptInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionS3ScriptInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_S3SCRIPT_INSTALL_H_
 #define _OPTION_S3SCRIPT_INSTALL_H_
 
-#include "S3SaveState.h"
+#include <Proc/Common/S3SaveState.h>
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
  *  Check to validate the definition
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionSwC1eInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionSwC1eInstall.h
index f8d8a06..445010f 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionSwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionSwC1eInstall.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _OPTION_SW_C1E_INSTALL_H_
 #define _OPTION_SW_C1E_INSTALL_H_
 
-#include "cpuSwC1e.h"
+#include <Proc/CPU/Feature/cpuSwC1e.h>
 
 /*  This option is designed to be included into the platform solution install
  *  file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c
index 64993b0..b1562d8 100644
--- a/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -49,7 +49,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Dispatcher.h"
 #include "Options.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Legacy/Proc/agesaCallouts.c b/src/vendorcode/amd/agesa/f14/Legacy/Proc/agesaCallouts.c
index 350c891..5342d32 100644
--- a/src/vendorcode/amd/agesa/f14/Legacy/Proc/agesaCallouts.c
+++ b/src/vendorcode/amd/agesa/f14/Legacy/Proc/agesaCallouts.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -49,9 +49,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Dispatcher.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "Ids.h"
 #include "Filecode.h"
 
@@ -400,4 +400,4 @@ AgesaPcieSlotResetControl (
   AGESA_STATUS Status;
   Status = AmdAgesaCallout (AGESA_GNB_PCIE_SLOT_RESET, (UINT32) FcnData, ResetInfo);
   return  Status;
-}
\ No newline at end of file
+}
diff --git a/src/vendorcode/amd/agesa/f14/Legacy/Proc/hobTransfer.c b/src/vendorcode/amd/agesa/f14/Legacy/Proc/hobTransfer.c
index bb23204..65271be 100644
--- a/src/vendorcode/amd/agesa/f14/Legacy/Proc/hobTransfer.c
+++ b/src/vendorcode/amd/agesa/f14/Legacy/Proc/hobTransfer.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -50,16 +50,16 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
-#include "cpuCacheInit.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
-//#include "cpuLateInit.h"
-#include "cpuEnvInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+//#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEnvInit.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Lib/amdlib.c b/src/vendorcode/amd/agesa/f14/Lib/amdlib.c
index 31b3f1e..a6a9602 100644
--- a/src/vendorcode/amd/agesa/f14/Lib/amdlib.c
+++ b/src/vendorcode/amd/agesa/f14/Lib/amdlib.c
@@ -52,8 +52,8 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10InitEarlyTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10InitEarlyTable.c
index 77d3237..c97f601 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10InitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10InitEarlyTable.c
@@ -50,9 +50,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10IoCstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10IoCstate.c
index 4905e77..d39d746 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10IoCstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10IoCstate.c
@@ -49,16 +49,16 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "cpuIoCstate.h"
 #include "cpuF10PowerMgmt.h"
-#include "cpuLateInit.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
-#include "cpuApicUtilities.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "CommonReturns.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
index 18cf367..7f34632 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
@@ -48,8 +48,8 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
index d45b71c..0be9ffe 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
@@ -50,12 +50,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF10PowerMgmt.h"
 #include "F10PmAsymBoostInit.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
index 3c959de..160c9f5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
@@ -50,12 +50,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF10PowerMgmt.h"
 #include "F10PmAsymBoostInit.h"
 #include "F10PackageType.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
index badc725..62badb5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
@@ -50,14 +50,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "cpuF10PowerMgmt.h"
-#include "cpuApicUtilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
 #include "OptionMultiSocket.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF10Utilities.h"
 #include "cpuCommonF10Utilities.h"
 #include "F10PmNbCofVidInit.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
index fd40297..4a1334d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
@@ -50,12 +50,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "cpuF10PowerMgmt.h"
-#include "cpuApicUtilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "F10PmNbPstateInit.h"
 #include "F10PackageType.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
index 5363ed2..c9269d3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
@@ -48,8 +48,8 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
index 4b8db7f..806803e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
@@ -52,12 +52,12 @@
  *----------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "GeneralServices.h"
-#include "cpuPostInit.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
index 2b6dcf3..297b73f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
index 153e3e0..bded016 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
index 71ff7fa..fecc04f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
index a6c3056..683d939 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
@@ -47,9 +47,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
index b894e71..2fbed8b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
index 5875acb..f6d5515 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "F10PackageType.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
index f81615d..53aa630 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
@@ -52,12 +52,12 @@
  *----------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "GeneralServices.h"
-#include "cpuPostInit.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
index 765b6ec..1537ca8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
index c69a608..f045c4c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
index 406dec8..4e52d10 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
index 51665af..b33d485 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
@@ -47,9 +47,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
index 82bc49e..00f6aea 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
index 1dfd967..dffd1e6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "F10PackageType.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
index 1c190f0..f035ba6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
index d8ae5d8..2ee4d5c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
index fe09593..8ba3df1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
index 71e27b1..ad2975c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
index 3e1afa4..190280c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
index 3c3fa89..f6a8755 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "cpuHwC1e.h"
-#include "cpuApicUtilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
 #include "cpuF10PowerMgmt.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
index c786585..214103a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
index 3fd5b31..15a1c38 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "F10PackageType.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
index 64fa687..56f36f7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
@@ -49,10 +49,10 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "cpuSwC1e.h"
-#include "cpuApicUtilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
 #include "cpuF10PowerMgmt.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
index 9910fd9..22a04fe 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
@@ -49,15 +49,15 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF10PowerMgmt.h"
 #include "GeneralServices.h"
-#include "cpuEarlyInit.h"
-#include "cpuPostInit.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
index 1db923a..1b08844 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
index 0a0852d..16e05e4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
index 1d6bc5d..6dc4faf 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
index 32a378d..733d079 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
@@ -47,9 +47,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
index 9fbfff7..e443e40 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
index 05f16ad..c96d117 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
index 0e07a9b..c670eea 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
index 888fe91..5a85f27 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDHtAssist.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDHtAssist.c
index ec7b09b..5e22e43 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDHtAssist.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDHtAssist.c
@@ -53,15 +53,15 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "CommonReturns.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "cpuF10PowerMgmt.h"
-#include "cpuLateInit.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuHtAssist.h"
 #include "F10PackageType.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
index 80be077..25af011 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
@@ -49,14 +49,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuFeatures.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
 #include "cpuMsgBasedC1e.h"
-#include "cpuApicUtilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
 #include "cpuF10PowerMgmt.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
index 3a4d127..1ca3463 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
@@ -49,14 +49,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF10PowerMgmt.h"
 #include "GeneralServices.h"
-#include "cpuEarlyInit.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
index 6b43faa..63578db 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
index fd8d90b..96cab38 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
index ecb0b0d..41bd0bd 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
@@ -50,11 +50,11 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "F10PackageType.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
index f0362f0..f9be667 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
index 5d9555c..7180716 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
@@ -47,9 +47,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
index 5390412..e717bf7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
index 18026de..70d0453 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
index 857e9d5..41bf7c0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
index 3ec04e0..1ec40fb 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
index cdfe9ad..82ddf7d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
index 333c830..1e08864 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "F10PackageType.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
index 7a080d5..e8a4f96 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
@@ -49,14 +49,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF10PowerMgmt.h"
 #include "GeneralServices.h"
-#include "cpuEarlyInit.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
index 5e2724c..8c7f054 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
index 131a10b..9064c7c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
index fdc83ac..6d39535 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
index 2748cb8..51f21fe 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
@@ -47,9 +47,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
index 90a91a6..33d7d89 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuCommonF10Utilities.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandId.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandId.c
index 49ecc9b..fc4f668 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandId.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandId.c
@@ -49,9 +49,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
index 25d96f5..9372e7c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
@@ -49,8 +49,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
index 16664ea..d607448 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
@@ -49,8 +49,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 #include "F10PackageType.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
index b3f8539..4431274 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
@@ -49,8 +49,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
index d837f9d..ff856f8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
@@ -49,8 +49,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
index f3f798d..eaf06a4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
@@ -49,8 +49,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
index e3d09aa..01dc76d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
@@ -49,8 +49,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
index acc908b..09da713 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
@@ -49,8 +49,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 #include "F10PackageType.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
index e041a02..8352ba6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
@@ -49,8 +49,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuCacheInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
index 6a70ced..ec83086 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
@@ -52,12 +52,12 @@
  *----------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "GeneralServices.h"
-#include "cpuPostInit.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Cpb.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Cpb.c
index d175ff1..641204f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Cpb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Cpb.c
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF10PowerMgmt.h"
-#include "cpuFeatures.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "cpuCpb.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Dmi.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Dmi.c
index 79a922e..52f4cca 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Dmi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Dmi.c
@@ -49,14 +49,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuPstateTables.h"
-#include "cpuLateInit.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
 #include "cpuF10PowerMgmt.h"
 #include "cpuF10Utilities.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
index d9639c2..2915603 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
@@ -50,14 +50,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "cpuF10PowerMgmt.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF10Utilities.h"
 #include "GeneralServices.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
index a10488c..8504c61 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
@@ -49,11 +49,11 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
-#include "cpuPostInit.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
 #include "cpuF10FeatureLeveling.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
index 1ffc91b..e29d7e1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
@@ -48,8 +48,8 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10MsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10MsrTables.c
index ce63635..c0c44f1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10MsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10MsrTables.c
@@ -48,8 +48,8 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PciTables.c
index 3f4e237..fd4b26f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PciTables.c
@@ -48,8 +48,8 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
index 877a122..f1263ab 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
@@ -50,13 +50,13 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "cpuF10PowerMgmt.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF10PowerCheck.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
 #include "cpuF10Utilities.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
index fa8f48d..9201ed8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
@@ -48,11 +48,11 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "IdsF10AllService.h"
-#include "cpuPowerMgmtSystemTables.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSystemTables.h>
 #include "cpuF10EarlyInit.h"
 #include "cpuF10SoftwareThermal.h"
 #include "cpuF10PowerPlane.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
index 6f6c2d0..2e4b5cd 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
@@ -50,16 +50,16 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "cpuF10PowerMgmt.h"
-#include "cpuApicUtilities.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF10Utilities.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "F10PackageType.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Pstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Pstate.c
index 8a2a381..6218f5b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Pstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Pstate.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "GeneralServices.h"
-#include "cpuPstateTables.h"
-#include "Table.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>>
 #include "cpuF10Utilities.h"
 #include "cpuF10PowerMgmt.h"
 #include "CommonReturns.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
index fdde8eb..f4344ec 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
@@ -49,10 +49,10 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF10PowerMgmt.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.c
index d07084a..9607a3b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.c
@@ -49,17 +49,17 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuPstateTables.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h>
 #include "cpuF10PowerMgmt.h"
-#include "cpuApicUtilities.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
 #include "cpuF10Utilities.h"
-#include "cpuPostInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
index 62dc72d..3f35909 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuLateInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
index e8456c9..3a8a158 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
@@ -48,9 +48,9 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "Table.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14C6State.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14C6State.c
index 2b7be5d..d703e80 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14C6State.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14C6State.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
-#include "cpuFeatures.h"
-#include "cpuC6State.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.h>
 #include "cpuF14PowerMgmt.h"
 #include "OptionFamily14hEarlySample.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14IoCstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14IoCstate.c
index c2536ed..1c203cf 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14IoCstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14IoCstate.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -49,15 +49,15 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
-#include "cpuFeatures.h"
-#include "cpuIoCstate.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.h>
 #include "cpuF14PowerMgmt.h"
-#include "cpuLateInit.h"
-#include "cpuApicUtilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
 #include "CommonReturns.h"
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_F14IOCSTATE_FILECODE
@@ -282,4 +282,4 @@ CONST IO_CSTATE_FAMILY_SERVICES ROMDATA F14IoCstateSupport =
   F14GetAcpiCstObj,
   F14CreateAcpiCstObj,
   (PF_IO_CSTATE_IS_CSD_GENERATED) CommonReturnFalse
-};
\ No newline at end of file
+};
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c
index 37203f3..eef328c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 
 /*----------------------------------------------------------------------------------------
  *                   D E F I N I T I O N S    A N D    M A C R O S
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c
index a6dbf48..513033b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 
 /*----------------------------------------------------------------------------------------
  *                   D E F I N I T I O N S    A N D    M A C R O S
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c
index 8b969cd..798e547 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 
 /*----------------------------------------------------------------------------------------
  *                   D E F I N I T I O N S    A N D    M A C R O S
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c
index bdc8abd..aa2971b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  ******************************************************************************
  */
 /*----------------------------------------------------------------------------------------
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 
 /*----------------------------------------------------------------------------------------
  *                   D E F I N I T I O N S    A N D    M A C R O S
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c
index 363e673..b861cda 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  ******************************************************************************
  */
 /*----------------------------------------------------------------------------------------
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 
 /*----------------------------------------------------------------------------------------
  *                   D E F I N I T I O N S    A N D    M A C R O S
@@ -1642,4 +1642,4 @@ CONST MICROCODE_PATCHES ROMDATA CpuF14MicrocodePatch05000101 =
 /*----------------------------------------------------------------------------------------
  *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
- */
\ No newline at end of file
+ */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnCpb.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnCpb.c
index ec97a8d..0676d83 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnCpb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnCpb.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  ******************************************************************************
  */
 
@@ -48,14 +48,13 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuF14PowerMgmt.h"
-#include "GnbRegistersON.h"
-#include "NbSmuLib.h"
-#include "NbSmuLib.h"
-#include "cpuFeatures.h"
-#include "cpuCpb.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerMgmt.h>
+#include <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
+#include <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnEquivalenceTable.c
index 1e29588..4d96fe5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnEquivalenceTable.c
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -23,10 +23,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -37,7 +37,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,10 +47,10 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #define FILECODE PROC_CPU_FAMILY_0X14_ON_F14ONEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c
index 620ed7d..0d25caa 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c
@@ -18,7 +18,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -26,10 +26,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -40,7 +40,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -50,11 +50,11 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuEarlyInit.h"
-#include "GnbRegistersON.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include "F14OnInitEarlyTable.h"
 #include "OptionFamily14hEarlySample.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnLogicalIdTables.c
index ec502b0..aa19d0f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnLogicalIdTables.c
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -23,10 +23,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -37,7 +37,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_ON_F14ONLOGICALIDTABLES_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnMicrocodePatchTables.c
index da445cc..7439bd3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnMicrocodePatchTables.c
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -23,10 +23,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -37,7 +37,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,9 +47,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_ON_F14ONMICROCODEPATCHTABLES_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnPciTables.c
index 37a03e8..5171562 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnPciTables.c
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -23,10 +23,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -37,7 +37,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  ******************************************************************************
  */
 
@@ -46,8 +46,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_ON_F14ONPCITABLES_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.c
index de100a2..82e1676 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -49,15 +49,15 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuCommonF14Utilities.h"
-#include "cpuF14PowerMgmt.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerMgmt.h>
 #include "OptionFamily14hEarlySample.h"
-#include "NbSmuLib.h"
-#include "GnbRegistersON.h"
+#include <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
+#include <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUCOMMONF14UTILITIES_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandId.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandId.c
index e873bb1..c2ba7df 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandId.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandId.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -49,9 +49,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14BRANDID_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandIdFt1.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandIdFt1.c
index 30ba2c1..c2e97f2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandIdFt1.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandIdFt1.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -49,8 +49,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 #include "F14PackageType.h"
 
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14CacheDefaults.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14CacheDefaults.c
index 8b8d30e..f84589e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14CacheDefaults.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14CacheDefaults.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -49,8 +49,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuCacheInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14CACHEDEFAULTS_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Dmi.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Dmi.c
index aaf761f..1f30822 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Dmi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Dmi.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -49,13 +49,13 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionDmi.h"
-#include "cpuLateInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
 #include "cpuF14PowerMgmt.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuPstateTables.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h>
 #include "cpuF14Utilities.h"
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14DMI_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.c
index 98fe9f1..a020490 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  ******************************************************************************
  */
 
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF14PowerMgmt.h"
 #include "cpuF14LowPowerInit.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14MsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14MsrTables.c
index 6c5ce28..53a9ca2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14MsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14MsrTables.c
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -23,10 +23,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -37,7 +37,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14MSRTABLES_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PciTables.c
index 1673a6d..49e8d17 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PciTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14PCITABLES_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PerCorePciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PerCorePciTables.c
index 8ca7bc5..83dd837 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PerCorePciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PerCorePciTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14PERCOREPCITABLES_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.c
index 6a1d15a..d865d4e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.c
@@ -50,14 +50,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "cpuF14PowerMgmt.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuEarlyInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF14PowerCheck.h"
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14POWERCHECK_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerMgmtSystemTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerMgmtSystemTables.c
index b234541..649569b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerMgmtSystemTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerMgmtSystemTables.c
@@ -48,10 +48,10 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuPowerMgmtSystemTables.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSystemTables.h>
 #include "cpuF14SoftwareThermal.h"
 #include "cpuF14PowerPlane.h"
 #include "cpuF14PowerCheck.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.c
index 0481160..87b4824 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.c
@@ -50,17 +50,17 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuCacheInit.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "cpuF14PowerMgmt.h"
 #include "cpuF14PowerPlane.h"
 #include "OptionFamily14hEarlySample.h"
-#include "NbSmuLib.h"
-#include "GnbRegistersON.h"
+#include <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
+#include <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14POWERPLANE_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Pstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Pstate.c
index 64bcf95..d328fc1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Pstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Pstate.c
@@ -49,11 +49,11 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuPstateTables.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "cpuF14Utilities.h"
 #include "cpuF14PowerMgmt.h"
 #include "CommonReturns.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.c
index 6eec83f..9ce5c3d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.c
@@ -49,9 +49,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "cpuF14PowerMgmt.h"
 #include "cpuF14SoftwareThermal.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.c
index 1ddcb15..26257c5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.c
@@ -49,16 +49,16 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuPstateTables.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h>
 #include "cpuF14PowerMgmt.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
 #include "cpuF14Utilities.h"
-#include "cpuPostInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14UTILITIES_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14WheaInitDataTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14WheaInitDataTables.c
index 8fe1080..50b1221 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14WheaInitDataTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14WheaInitDataTables.c
@@ -47,8 +47,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuLateInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14WHEAINITDATATABLES_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.c
index 2f7a931..fbdacee 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.c
@@ -50,18 +50,18 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
 #include "GeneralServices.h"
 #include "OptionMultiSocket.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "PreserveMailbox.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.c
index 010162f..b21da67 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.c
@@ -49,16 +49,16 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "OptionMultiSocket.h"
-#include "cpuApicUtilities.h"
-#include "cpuServices.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "cpuC6State.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
index 0f40155..ff2eb82 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
@@ -53,13 +53,13 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuFeatures.h"
-#include "cpuApicUtilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
 #include "OptionMultiSocket.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.c
index 6d06745..385529c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.c
@@ -52,15 +52,15 @@
  *----------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Topology.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuCacheInit.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCoreLeveling.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCoreLeveling.c
index 700f9ae..8cbbd10 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCoreLeveling.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCoreLeveling.c
@@ -53,15 +53,15 @@
  */
 #include "AGESA.h"
 #include "AMD.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Topology.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuFeatures.h"
-#include "cpuEarlyInit.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.c
index e31c6b8..4e91f89 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.c
@@ -49,8 +49,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "cpuCpb.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c
index b816732..1d87370 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c
@@ -49,15 +49,15 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionDmi.h"
-#include "cpuLateInit.h"
-#include "cpuServices.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "GeneralServices.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Ids.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatureLeveling.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatureLeveling.c
index 2d11ffa..967e1d6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatureLeveling.c
@@ -52,13 +52,13 @@
  *----------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
-#include "cpuPostInit.h"
-#include "cpuApicUtilities.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.c
index 799fed0..9c0cb64 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.c
@@ -49,8 +49,8 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "GeneralServices.h"
-#include "cpuFeatures.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHtAssist.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHtAssist.c
index 9370afd..8954aca 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHtAssist.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHtAssist.c
@@ -53,15 +53,15 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Topology.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuLateInit.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "cpuHtAssist.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.c
index c3542a1..8254b76 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.c
@@ -49,15 +49,15 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Topology.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "cpuHwC1e.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.c
index 46a8ece..0045ac4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.c
@@ -49,12 +49,12 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "cpuIoCstate.h"
-#include "cpuServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuApicUtilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
 #include "OptionMultiSocket.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.c
index 8d5cbd1..e5d4255 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.c
@@ -49,11 +49,11 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "OptionMultiSocket.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "cpuLowPwrPstate.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.c
index 9e68d93..f1df7b9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.c
@@ -49,14 +49,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMultiSocket.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "cpuMsgBasedC1e.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateGather.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateGather.c
index 3367b13..b11d42f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateGather.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateGather.c
@@ -52,17 +52,17 @@
  *----------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionPstate.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuPostInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
 #include "Ids.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuPstateTables.h"
-#include "cpuApicUtilities.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateLeveling.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateLeveling.c
index c0ba407..88d96f3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateLeveling.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateLeveling.c
@@ -52,16 +52,16 @@
  *----------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionPstate.h"
-#include "cpuLateInit.h"
-#include "cpuRegisters.h"
-#include "cpuPostInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
 #include "Ids.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuPstateTables.h"
-#include "cpuApicUtilities.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.c
index aa14af1..21d7948 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.c
@@ -52,19 +52,19 @@
  *----------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionPstate.h"
-#include "cpuLateInit.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Ids.h"
 #include "Filecode.h"
 #include "GeneralServices.h"
-#include "cpuPstateTables.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "cpuIoCstate.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSlit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSlit.c
index 6290afe..1774d17 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSlit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSlit.c
@@ -55,14 +55,14 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionSlit.h"
-#include "heapManager.h"
-#include "cpuLateInit.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Topology.h"
 #include "Ids.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSrat.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSrat.c
index 1fc2b88..7f94d97 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSrat.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSrat.c
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "OptionSrat.h"
-#include "heapManager.h"
-#include "cpuRegisters.h"
-#include "cpuLateInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
 #include "Ids.h"
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.c
index 3be7d06..9438325 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.c
@@ -49,15 +49,15 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Topology.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "cpuSwC1e.h"
 #include "cpuHwC1e.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuWhea.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuWhea.c
index 76a6879..e5ff8e8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuWhea.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuWhea.c
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionWhea.h"
-#include "cpuLateInit.h"
-#include "heapManager.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Ids.h"
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c
index f3825dd..1c13495 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c
@@ -50,14 +50,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Table.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Table.c
index 26af05a..d16ffcc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Table.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Table.c
@@ -49,16 +49,16 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
 #include "OptionMultiSocket.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "CommonReturns.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cahalt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cahalt.c
index 938300a..cc9f3ee 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cahalt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cahalt.c
@@ -53,7 +53,7 @@
  */
 
 #include "AGESA.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Filecode.h"
 
  /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.c
index 0b9b9c6..469a37a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.c
@@ -49,15 +49,15 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuCacheInit.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBist.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBist.c
index 0d74628..5701dfc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBist.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBist.c
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
-#include "cpuApicUtilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBrandId.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBrandId.c
index c41e57d..0eda70f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBrandId.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBrandId.c
@@ -49,13 +49,13 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionPstate.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuEarlyInit.h"
-#include "cpuRegisters.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.c
index 516cebf..3105f14 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.c
@@ -49,17 +49,17 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "Table.h"
-#include "cpuApicUtilities.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 #include "Topology.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEventLog.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEventLog.c
index 97fd052..e3c84d50 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEventLog.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEventLog.c
@@ -50,8 +50,8 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "GeneralServices.h"
 #include "Ids.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.c
index 25be191..902b79a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.c
@@ -48,12 +48,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "CommonReturns.h"
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuGeneralServices.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuGeneralServices.c
index 473c8db..1e5edd6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuGeneralServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuGeneralServices.c
@@ -50,16 +50,16 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Options.h"
 #include "Topology.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuServices.h"
-#include "heapManager.h"
-#include "cpuApicUtilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuInitEarlyTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuInitEarlyTable.c
index dbc7f2c..1cf0b33 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuInitEarlyTable.c
@@ -50,9 +50,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.c
index bc0c975..139764e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.c
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuLateInit.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuMicrocodePatch.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuMicrocodePatch.c
index bc15447..51a9ad6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuMicrocodePatch.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuMicrocodePatch.c
@@ -49,13 +49,13 @@
  *---------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.c
index 3b60757..915aba7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.c
@@ -50,18 +50,18 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Options.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "heapManager.h"
-#include "cpuServices.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "GeneralServices.h"
-#include "cpuPostInit.h"
-#include "cpuPstateTables.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmt.c
index 2c09af3..4632591 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmt.c
@@ -50,14 +50,14 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "OptionMultiSocket.h"
-#include "cpuApicUtilities.h"
-#include "cpuEarlyInit.h"
-#include "cpuPowerMgmtSystemTables.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSystemTables.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.c
index e975ccb..188ad36 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.c
@@ -50,14 +50,14 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "GeneralServices.h"
-#include "cpuServices.h"
-#include "cpuApicUtilities.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuPowerMgmtSystemTables.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSystemTables.h>
 #include "cpuPowerMgmtMultiSocket.h"
 #include "GeneralServices.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.c
index 0578fcf..f5c65ea 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.c
@@ -50,12 +50,12 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "GeneralServices.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuPowerMgmtSystemTables.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSystemTables.h>
 #include "cpuPowerMgmtSingleSocket.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h
index c84628a..7610920 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -47,7 +47,7 @@
 #ifndef _CPU_REGISTERS_H_
 #define _CPU_REGISTERS_H_
 
-#include "cpuFamRegisters.h"
+#include "Family/cpuFamRegisters.h"
 /*
  *--------------------------------------------------------------
  *
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuWarmReset.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuWarmReset.c
index 81ac8f6..73d5f14 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuWarmReset.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuWarmReset.c
@@ -50,10 +50,10 @@
  */
 
 #include "AGESA.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
-#include "cpuFamilyTranslation.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.c
index f6b409f..f3f3fa2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.c
@@ -50,14 +50,14 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "heapManager.h"
-#include "cpuCacheInit.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEarly.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEarly.c
index ea048eb..ffa90c4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEarly.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEarly.c
@@ -50,14 +50,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuCacheInit.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuEarlyInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
 #include "AdvancedApi.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "CommonInits.h"
 #include "GnbInterface.h"
 //#include "GnbInitAtEarly.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEnv.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEnv.c
index 1e32c21..1918819 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEnv.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEnv.c
@@ -51,12 +51,12 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuEnvInit.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEnvInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "CreateStruct.h"
 #include "GnbInterface.h"
 #include "CommonInits.h"
-#include "S3SaveState.h"
+#include <vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitLate.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitLate.c
index d5669e4..ef9f972 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitLate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitLate.c
@@ -50,12 +50,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionDmi.h"
 #include "OptionSlit.h"
-#include "cpuLateInit.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "CommonInits.h"
 #include "GnbInterface.h"
 #include "OptionPstate.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitMid.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitMid.c
index e707f7d..3ed6a94 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitMid.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitMid.c
@@ -51,7 +51,7 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 #include "CommonInits.h"
 #include "CreateStruct.h"
 #include "GnbInterface.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitPost.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitPost.c
index 958d1e5..b517a8c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitPost.c
@@ -50,17 +50,17 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
-#include "mm.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
-#include "cpuPostInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
 #include "AdvancedApi.h"
 #include "CreateStruct.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "CommonInits.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GnbInterface.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitRecovery.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitRecovery.c
index efa2671..3207f44 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitRecovery.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitRecovery.c
@@ -50,14 +50,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "AdvancedApi.h"
-#include "heapManager.h"
-#include "mm.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
 #include "GnbInterface.h"
 #include "cpuRecovery.h"
-#include "cpuCacheInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c
index a3f0870..8f3164d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c
@@ -50,10 +50,10 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuCacheInit.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "AdvancedApi.h"
 #include "GeneralServices.h"
 #include "OptionsHt.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitResume.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitResume.c
index 532f7d5..b279fb7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitResume.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitResume.c
@@ -50,19 +50,19 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
 #include "Filecode.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "cpuPostInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h>
 #include "CreateStruct.h"
 #include "CommonInits.h"
-#include "cpuFeatures.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3LateRestore.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3LateRestore.c
index 62e23d6..8b7e513 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3LateRestore.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3LateRestore.c
@@ -50,11 +50,11 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "S3.h"
-#include "cpuFeatures.h"
-#include "S3SaveState.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
+#include <vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.h>
 #include "CommonInits.h"
 #include "CreateStruct.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3Save.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3Save.c
index 448d0f9..8f2db6c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3Save.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3Save.c
@@ -50,16 +50,16 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
 #include "CommonInits.h"
 #include "CreateStruct.h"
 #include "Filecode.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Topology.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/CommonInits.c b/src/vendorcode/amd/agesa/f14/Proc/Common/CommonInits.c
index 3b23e20..0940b97 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/CommonInits.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/CommonInits.c
@@ -53,7 +53,7 @@
 #include "Ids.h"
 #include "CommonInits.h"
 #include "Filecode.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/CreateStruct.c b/src/vendorcode/amd/agesa/f14/Proc/Common/CreateStruct.c
index 1b691a6..c136b21 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/CreateStruct.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/CreateStruct.c
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "GeneralServices.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "CreateStruct.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/S3RestoreState.c b/src/vendorcode/amd/agesa/f14/Proc/Common/S3RestoreState.c
index 5e32121..e74fd2c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/S3RestoreState.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/S3RestoreState.c
@@ -52,9 +52,9 @@
 #include "AMD.h"
 #include "AGESA.h"
 #include "Ids.h"
-#include "amdlib.h"
-#include "heapManager.h"
-#include "S3SaveState.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.c b/src/vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.c
index 7c52ed8..ca3d93c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.c
@@ -52,9 +52,9 @@
 #include "AMD.h"
 #include "AGESA.h"
 #include "Ids.h"
-#include "amdlib.h"
-#include "heapManager.h"
-#include "S3SaveState.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.c
index 3101d81..8f0efd2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.c
@@ -50,9 +50,9 @@
  */
 #include  "Porting.h"
 #include  "AMD.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  "OptionGnb.h"
-#include  "GnbLibFeatures.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.h>
 #include  "Filecode.h"
 #define  FILECODE PROC_GNB_COMMON_GNBLIBFEATURES_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/Family/0x14/F14GfxServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/Family/0x14/F14GfxServices.c
index 8d0e84f..b921608 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/Family/0x14/F14GfxServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/Family/0x14/F14GfxServices.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -50,25 +50,24 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "heapManager.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include  "GeneralServices.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbGfx.h"
-#include  "GnbRegistersON.h"
-#include  "GfxIntegratedInfoTableInit.h"
-#include  "GfxRegisterAcc.h"
-#include  "GfxLib.h"
-#include  "GnbFuseTable.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
 #include  GNB_MODULE_DEFINITIONS (GnbGfxInitLibV1)
-#include  "GnbCommonLib.h"
-#include  "GnbCommonLib.h"
-#include  "GnbGfxFamServices.h"
-#include  "GfxFamilyServices.h"
-#include  "F14NbPowerGate.h"
-#include  "cpuFamilyTranslation.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbCommonLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfxFamServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/Family/GfxFamilyServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.h>
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_FAMILY_0X14_F14GFXSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.c
index 0326f37..46c8d59 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.c
@@ -49,14 +49,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbGfx.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  "GfxStrapsInit.h"
-#include  "GfxConfigData.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.h>
 #include  "OptionGnb.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXCONFIGDATA_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxGmcInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxGmcInit.c
index 4282847..18d1483 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxGmcInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxGmcInit.c
@@ -48,20 +48,20 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-//#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbGfx.h"
-#include  "GnbPcie.h"
-#include  "GnbGfxFamServices.h"
+//#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfxFamServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
-#include  "GfxLib.h"
-#include  "GfxFamilyServices.h"
-#include  "GfxRegisterAcc.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/Family/GfxFamilyServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.h>
 //#include  "GfxStrapsInit.h"
 #include  "OptionGnb.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXGMCINIT_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtEnvPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtEnvPost.c
index 70a5b09..3efa812 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtEnvPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtEnvPost.c
@@ -49,10 +49,10 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbGfx.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include  GNB_MODULE_DEFINITIONS (GnbGfxConfig)
 #include  "GfxStrapsInit.h"
 #include  "GfxInitAtEnvPost.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtMidPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtMidPost.c
index 1ca08e4..5a43243 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtMidPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtMidPost.c
@@ -49,17 +49,17 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbGfx.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include  GNB_MODULE_DEFINITIONS (GnbGfxConfig)
-#include  "GfxConfigData.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.h>
 #include  "GfxStrapsInit.h"
 #include  "GfxGmcInit.h"
 #include  "GfxInitAtMidPost.h"
-#include  "GnbGfxFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfxFamServices.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXINITATMIDPOST_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtPost.c
index 3bfa8a4..3634cde 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtPost.c
@@ -49,16 +49,16 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbGfx.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include  GNB_MODULE_DEFINITIONS (GnbGfxInitLibV1)
 #include  GNB_MODULE_DEFINITIONS (GnbGfxConfig)
 #include  "GfxStrapsInit.h"
-#include  "GfxLib.h"
-#include  "GfxConfigData.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.h>
 #include  "GfxInitAtPost.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXINITATPOST_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c
index a3db0c1..80dfabc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c
@@ -50,24 +50,24 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbFuseTable.h"
-#include  "GnbPcie.h"
-#include  "GnbGfx.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  GNB_MODULE_DEFINITIONS (GnbGfxInitLibV1)
 #include  GNB_MODULE_DEFINITIONS (GnbGfxConfig)
-#include  "GfxLib.h"
-#include  "GfxConfigData.h"
-#include  "GfxRegisterAcc.h"
-#include  "GfxFamilyServices.h"
-#include  "GnbGfxFamServices.h"
-#include  "GfxIntegratedInfoTableInit.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/Family/GfxFamilyServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfxFamServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXINTEGRATEDINFOTABLEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.c
index 70eeca8..6911faf 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.c
@@ -49,15 +49,15 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbGfx.h"
-#include  "GnbFuseTable.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
-#include  "GfxLib.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXLIB_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.c
index 5c341c7..8734cb3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.c
@@ -49,13 +49,13 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbGfx.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
-#include  "GfxRegisterAcc.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXREGISTERACC_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxStrapsInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxStrapsInit.c
index 06a780b..9208c9a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxStrapsInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxStrapsInit.c
@@ -49,18 +49,18 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-//#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbGfx.h"
+//#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  "GfxStrapsInit.h"
-#include  "GfxLib.h"
-#include  "GfxRegisterAcc.h"
-#include  "NbSmuLib.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
 #include  "OptionGnb.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXSTRAPSINIT_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEarly.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEarly.c
index d9a2d7e..64f5a0c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEarly.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEarly.c
@@ -50,10 +50,10 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 
 #include  "OptionGnb.h"
-#include  "GnbLibFeatures.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.h>
 #include  "GnbInterface.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATEARLY_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEnv.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEnv.c
index 139ac3e..7b2f122 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEnv.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEnv.c
@@ -49,9 +49,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  "OptionGnb.h"
-#include  "GnbLibFeatures.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.h>
 #include  "GnbInterface.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATENV_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtLate.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtLate.c
index 8db9a1b..07086d9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtLate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtLate.c
@@ -49,9 +49,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  "OptionGnb.h"
-#include  "GnbLibFeatures.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.h>
 #include  "GnbInterface.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATLATE_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtMid.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtMid.c
index f2ede88..c8df199 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtMid.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtMid.c
@@ -49,9 +49,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  "OptionGnb.h"
-#include  "GnbLibFeatures.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.h>
 #include  "GnbInterface.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATMID_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtPost.c
index ce5209f..02df56d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtPost.c
@@ -49,10 +49,10 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  "OptionGnb.h"
 #include  "Ids.h"
-#include  "GnbLibFeatures.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.h>
 #include  "GnbInterface.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATPOST_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtReset.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtReset.c
index c903bf4..d33ea13 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtReset.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtReset.c
@@ -49,7 +49,7 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  "GnbInterface.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATRESET_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c
index 08fd84a..55571f5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c
@@ -49,14 +49,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
-#include  "GnbRegistersON.h"
-#include  "cpuFamilyTranslation.h"
-#include  "NbSmuLib.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
 #include  "GnbCableSafeDefs.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCABLESAFE_GNBCABLESAFE_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
index 8f983db..3fb17e2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
@@ -50,8 +50,8 @@
  */
 #include  "Porting.h"
 #include  "AMD.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  "GnbLib.h"
 #include  "GnbLibIoAcc.h"
 #include  "GnbLibPciAcc.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
index 0f45f7d..47b587a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
@@ -50,7 +50,7 @@
  */
 #include  "Porting.h"
 #include  "AMD.h"
-#include  "heapManager.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include  "GnbLibPciAcc.h"
 #include  "GnbLibHeap.h"
 #include  "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
index d7d5242..ef58061 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
@@ -50,9 +50,9 @@
  */
 #include "Porting.h"
 #include "AMD.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "GnbLibIoAcc.h"
-#include "S3SaveState.h"
+#include <vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.h>
 #include "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBIOACC_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
index 019d705..0af2f79 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
@@ -50,9 +50,9 @@
  */
 #include  "Porting.h"
 #include  "AMD.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "GnbLibMemAcc.h"
-#include  "S3SaveState.h"
+#include  <vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBMEMACC_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPci.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPci.c
index 8c02a9b..082613c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPci.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPci.c
@@ -50,7 +50,7 @@
 #include  "GnbLibPciAcc.h"
 #include  "GnbLibPci.h"
 #include  "GnbLibPci.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "GnbLib.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBPCI_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
index ac27a30..2f985a8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
@@ -50,9 +50,9 @@
  */
 #include  "Porting.h"
 #include  "AMD.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "GnbLibPciAcc.h"
-#include  "S3SaveState.h"
+#include  <vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBPCIACC_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
index dc73e2d..45fd49d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
@@ -49,14 +49,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbGfx.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include  "GnbGfxConfig.h"
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
-#include  "GfxConfigData.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.h>
 #include  "GfxConfigPost.h"
 #include  "OptionGnb.h"
 #include  "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
index a8d4957..ece303d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
@@ -49,11 +49,11 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbGfx.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  "GfxConfigPost.h"
 #include  "OptionGnb.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
index 9b59514..53dadb0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
@@ -50,9 +50,9 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbGfx.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  "GfxCardInfo.h"
 #include  "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
index 453576d..43a9dee 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
@@ -51,16 +51,16 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbGfx.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
-#include  "GnbGfxFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfxFamServices.h>
 #include  "GfxEnumConnectors.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXENUMCONNECTORS_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
index feb6123..2347fa2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
@@ -51,14 +51,14 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbFuseTable.h"
-#include  "GnbPcie.h"
-#include  "GnbGfx.h"
-#include  "GnbFuseTable.h"
-#include  "GnbGfxFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfxFamServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  "GfxPowerPlayTable.h"
 #include  "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.h b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.h
index f76688b..67acb98 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.h
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -48,7 +48,7 @@
 #ifndef _GNBGFXINITLIBV1_H_
 #define _GNBGFXINITLIBV1_H_
 
-#include "GnbGfx.h"
+#include <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbGfx.h>
 #include "GfxEnumConnectors.h"
 #include "GfxPowerPlayTable.h"
 #include "GfxCardInfo.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
index 07b0961..349b4fc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
@@ -50,11 +50,11 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  "GnbNbInitLibV1.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBNBINITLIBV1_GNBNBINITLIBV1_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
index b2b96f7..227953e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
@@ -52,20 +52,20 @@
 
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "heapManager.h"
-#include  "cpuLateInit.h"
-#include  "cpuRegisters.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbPcieFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "OptionGnb.h"
 #include  "PcieAlib.h"
-#include  "GnbFuseTable.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEALIBV1_PCIEALIB_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
index 16167d2..8a7d2f7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
@@ -50,12 +50,12 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "heapManager.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include  "OptionGnb.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbPcieFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  "PcieConfigData.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
index cbae86d..4b0a41c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
@@ -50,10 +50,10 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbPcieFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  "PcieMapTopology.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
index 1f762c3..14afe20 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
@@ -50,8 +50,8 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  "PcieInputParser.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIEINPUTPARSER_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
index 3045171..14ebeca 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
@@ -50,10 +50,10 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbPcieFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
 #include  "GeneralServices.h"
 #include  "PcieInputParser.h"
 #include  "PcieMapTopology.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c
index 80210d1..916da75 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c
@@ -50,8 +50,8 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  "OptionGnb.h"
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
index 8192b3d..16371bf 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
@@ -48,8 +48,8 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  "PcieAspmBlackList.h"
 #include  "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
index 1dffc52..dd094d4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
@@ -50,8 +50,8 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #include  "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
index 3fbd2f4..e4323ad 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
@@ -50,12 +50,12 @@
 
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPHYSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
index 8633512..29f03ee 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
@@ -50,12 +50,12 @@
 
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPIFSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
index 55a205d..48e726c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
@@ -51,9 +51,9 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbPcieFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  "PciePortRegAcc.h"
 #include  "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
index 19bd1c5..607e31a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
@@ -50,12 +50,12 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPORTSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
index a5a9e35..971a32e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
@@ -50,12 +50,12 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPOWERMGMT_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSbLink.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSbLink.c
index 09f9bab..f620624 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSbLink.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSbLink.c
@@ -50,12 +50,12 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIESBLINK_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
index eafcce4..92ffde4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
@@ -49,13 +49,13 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIESILICONSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
index 0abd677..21d8fb9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
@@ -50,12 +50,12 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIETIMER_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
index ae9fd5c..37d96ea 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
@@ -50,14 +50,14 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbPcieFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIETOPOLOGYSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
index 00fca78..2227f30 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
@@ -50,13 +50,13 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEUTILITYLIB_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieWrapperRegAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieWrapperRegAcc.c
index f47e58e..16de508 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieWrapperRegAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieWrapperRegAcc.c
@@ -46,9 +46,9 @@
 
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbPcieFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #include  "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
index 5a5faf3..2f3b66b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
@@ -50,16 +50,16 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "GeneralServices.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #include  "PcieWorkarounds.h"
 #include  "PcieTraining.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIETRAININGV1_PCIETRAINING_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
index c256eba..fb42e6e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
@@ -50,12 +50,12 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "PcieWorkarounds.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIETRAININGV1_PCIEWORKAROUNDS_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkDpm.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkDpm.c
index c938ccc..d0e709c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkDpm.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkDpm.c
@@ -50,21 +50,21 @@
  */
 
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbFuseTable.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "OptionGnb.h"
-#include  "GfxLib.h"
-#include  "NbConfigData.h"
-#include  "NbSmuLib.h"
-#include  "NbLclkDpm.h"
-#include  "NbFamilyServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/NbFamilyServices.h>
 #include  "Filecode.h"
 
 #define FILECODE PROC_GNB_NB_FAMILY_0X14_F14NBLCLKDPM_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkNclkRatio.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkNclkRatio.c
index 889fec3..1b48236 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkNclkRatio.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkNclkRatio.c
@@ -50,14 +50,14 @@
  */
 
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "heapManager.h"
-#include  "GnbFuseTable.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
-#include  "GfxLib.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "F14NbLclkNclkRatio.h"
 #include  "Filecode.h"
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.c
index a1c2639..ff75b29 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.c
@@ -50,19 +50,19 @@
  */
 
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbFuseTable.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
-#include  "GnbRegistersON.h"
-#include  "GfxLib.h"
-#include  "NbSmuLib.h"
-#include  "NbConfigData.h"
-#include  "NbFamilyServices.h"
-#include  "F14NbPowerGate.h"
-#include  "GfxLib.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/NbFamilyServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_FAMILY_0x14_F14NBPOWERGATE_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbServices.c
index 74e3bbc..49edfe9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbServices.c
@@ -50,22 +50,22 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbFuseTable.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbGfxInitLibV1)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
-#include  "NbConfigData.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
 #include  "OptionGnb.h"
-#include  "NbLclkDpm.h"
-#include  "NbFamilyServices.h"
-#include  "NbPowerMgmt.h"
-#include  "GfxLib.h"
-#include  "GnbRegistersON.h"
-#include  "cpuFamilyTranslation.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/NbFamilyServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_FAMILY_0X14_F14NBSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmu.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmu.c
index a2ed861..4b5c5af 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmu.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmu.c
@@ -49,10 +49,10 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "NbSmuLib.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
 #include  "F14NbSmuFirmware.h"
 #include  "Filecode.h"
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbFuseTable.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbFuseTable.c
index ea9afd2..adf6f18 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbFuseTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbFuseTable.c
@@ -50,18 +50,18 @@
  */
 
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbFuseTable.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
-#include  "GnbRegistersON.h"
-#include  "NbSmuLib.h"
-#include  "NbConfigData.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
 #include  "NbFuseTable.h"
-#include  "NbFamilyServices.h"
-#include  "GfxLib.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/NbFamilyServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
 #include  "Filecode.h"
 
 #define FILECODE PROC_GNB_NB_FEATURE_NBFUSETABLE_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.c
index b8f683e..507b927 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.c
@@ -50,19 +50,19 @@
  */
 
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "heapManager.h"
-#include  "Gnb.h"
-#include  "GnbFuseTable.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "OptionGnb.h"
-#include  "GfxLib.h"
-#include  "NbConfigData.h"
-#include  "NbSmuLib.h"
-#include  "NbLclkDpm.h"
-#include  "NbFamilyServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/NbFamilyServices.h>
 #include  "Filecode.h"
 
 #define FILECODE PROC_GNB_NB_FEATURE_NBLCLKDPM_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.c
index 0dd2f9a..2264829 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.c
@@ -49,10 +49,10 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "NbConfigData.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBCONFIGDATA_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInit.c
index f723480..a79ac8f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInit.c
@@ -49,15 +49,15 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
-#include  "GfxLib.h"
-#include  "NbSmuLib.h"
-#include  "NbConfigData.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
 #include  "NbInit.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINIT_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEarly.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEarly.c
index b09d192..c617df5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEarly.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEarly.c
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbNbInitLibV1)
-#include  "NbConfigData.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
 #include  "NbInit.h"
 #include  "NbInitAtEarly.h"
 #include  "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEnv.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEnv.c
index 0317e4c..71f6d9b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEnv.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEnv.c
@@ -50,14 +50,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbFuseTable.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbNbInitLibV1)
-#include  "NbConfigData.h"
-#include  "NbFamilyServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/NbFamilyServices.h>
 #include  "NbInitAtEnv.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINITATENV_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtLatePost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtLatePost.c
index 854f900..507d607 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtLatePost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtLatePost.c
@@ -50,13 +50,13 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbNbInitLibV1)
-#include  "NbConfigData.h"
-#include  "NbPowerMgmt.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.h>
 #include  "NbInitAtLatePost.h"
 #include  "Filecode.h"
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtPost.c
index c092f7f..297435d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtPost.c
@@ -49,12 +49,12 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbNbInitLibV1)
-#include  "NbConfigData.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
 #include  "NbInitAtPost.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINITATPOST_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtReset.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtReset.c
index 1620c48..c904e0d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtReset.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtReset.c
@@ -49,9 +49,9 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  "NbInitAtReset.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINITATRESET_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.c
index 56e6a1a..bc8e59a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.c
@@ -49,18 +49,18 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbFuseTable.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
-#include  "NbConfigData.h"
-#include  "NbSmuLib.h"
-#include  "NbFamilyServices.h"
-#include  "NbPowerMgmt.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/NbFamilyServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.h>
 #include  "OptionGnb.h"
-#include  "GfxLib.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBPOWERMGMT_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.c
index 06f3ba5..16e4138 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.c
@@ -49,14 +49,14 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include  "Ids.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  "OptionGnb.h"
-#include  "NbSmuLib.h"
-#include  "GnbRegistersON.h"
-#include  "S3SaveState.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
+#include  <vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBSMULIB_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlib.c
index b984194..8dfddc8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlib.c
@@ -50,12 +50,12 @@
  */
 #include "AGESA.h"
 #include "Ids.h"
-#include  "heapManager.h"
-#include  "Gnb.h"
-//#include  "GnbPcieFamServices.h"
-#include  "GnbFuseTable.h"
-#include  "GnbRegistersON.h"
-#include  "cpuLateInit.h"
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+//#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbFuseTable.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
+#include  <vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  "F14PcieAlibSsdt.h"
 #include  "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexConfig.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexConfig.c
index 5d9153b..47c21ff 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexConfig.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexConfig.c
@@ -50,10 +50,10 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbPcieFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  "OntarioDefinitions.h"
 #include  "OntarioComplexData.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexServices.c
index 0895c52..247d47b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexServices.c
@@ -49,16 +49,16 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  "OntarioDefinitions.h"
-#include  "GnbPcieFamServices.h"
-#include  "PcieFamilyServices.h"
-#include  "GnbRegistersON.h"
-#include  "NbSmuLib.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/PcieFamilyServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
 #include  "Filecode.h"
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X14_F14PCIECOMPLEXSERVICES_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePhyServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePhyServices.c
index fc7d460..3a8f4d6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePhyServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePhyServices.c
@@ -50,9 +50,9 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "OntarioDefinitions.h"
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X14_F14PCIEPHYSERVICES_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePifServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePifServices.c
index fa1e62c..58f4ed4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePifServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePifServices.c
@@ -50,12 +50,12 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "PcieFamilyServices.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/PcieFamilyServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X14_F14PCIEPIFSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieWrapperServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieWrapperServices.c
index 3821ac7..7f93bfa 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieWrapperServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieWrapperServices.c
@@ -50,16 +50,16 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "PcieFamilyServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/PcieFamilyServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
-#include  "PcieMiscLib.h"
-#include  "GnbPcieFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
 #include  "OntarioDefinitions.h"
-#include  "GnbRegistersON.h"
-#include  "NbSmuLib.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X14_F14PCIEWRAPPERSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Feature/PciePowerGate.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Feature/PciePowerGate.c
index 68ce810..84a0722 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Feature/PciePowerGate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Feature/PciePowerGate.c
@@ -51,15 +51,15 @@
 
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  "PcieInit.h"
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  "PciePowerGate.h"
-#include  "GnbRegistersON.h"
-#include  "NbSmuLib.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FEATURE_PCIEPOWERGATE_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInit.c
index 3c27126..8c5f090 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInit.c
@@ -51,16 +51,16 @@
 
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbPcieFamServices.h"
-#include  "PcieFamilyServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/PcieFamilyServices.h>
 #include  "PcieInit.h"
-#include  "PcieMiscLib.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.h>
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieTrainingV1)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEarlyPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEarlyPost.c
index 7da85e4..5060735 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEarlyPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEarlyPost.c
@@ -51,8 +51,8 @@
 
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  "PcieInit.h"
 #include  "PciePortInit.h"
 #include  GNB_MODULE_DEFINITIONS (GnbPcieTrainingV1)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEnv.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEnv.c
index 3bdc2b9..bf45c0c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEnv.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEnv.c
@@ -49,12 +49,12 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  "PcieInit.h"
 #include  "PcieInitAtPost.h"
 #include  "PcieInitAtEnv.h"
-#include  "S3SaveState.h"
+#include  <vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINITATENV_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtLatePost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtLatePost.c
index 2aa4ff9..af18a82 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtLatePost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtLatePost.c
@@ -49,8 +49,8 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  "PcieInit.h"
 #include  "PcieLateInit.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtPost.c
index 4d6e4f0..2c2670b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtPost.c
@@ -49,8 +49,8 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  "PcieInit.h"
 #include  "PciePortInit.h"
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieLateInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieLateInit.c
index d5e9189..26cbd90 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieLateInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieLateInit.c
@@ -51,14 +51,14 @@
 
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
 #include  "PcieLateInit.h"
-#include  "PcieFamilyServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/PcieFamilyServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIELATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.c
index e5ae7a6..aa5b790 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.c
@@ -50,14 +50,14 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbPcieFamServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
-#include  "PcieMiscLib.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEMISCLIB_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortInit.c
index 567c2fa..17c4d5a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortInit.c
@@ -50,16 +50,16 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "GnbPcieFamServices.h"
-#include  "PcieFamilyServices.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcieFamServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/PcieFamilyServices.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieTrainingV1)
 #include  "PciePortInit.h"
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEPORTINIT_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortLateInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortLateInit.c
index 27bf293..c21a1d5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortLateInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortLateInit.c
@@ -50,14 +50,14 @@
  */
 #include  "AGESA.h"
 #include  "Ids.h"
-#include  "Gnb.h"
-#include  "GnbPcie.h"
-#include  "PcieFamilyServices.h"
-#include  "PcieMiscLib.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/PcieFamilyServices.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #include  GNB_MODULE_DEFINITIONS (GnbPcieConfig)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEPORTLATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbCoherentFam10.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbCoherentFam10.c
index a346e51..f8d6c2b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbCoherentFam10.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbCoherentFam10.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
-#include "htNb.h"
-#include "htNbHardwareFam10.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNbHardwareFam10.h>
 #include "htNbCoherentFam10.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbFam10.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbFam10.c
index b3c6702..f476db8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbFam10.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbFam10.c
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -23,10 +23,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -37,7 +37,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -50,12 +50,12 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionsHt.h"
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
-#include "htNb.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
 #include "CommonReturns.h"
 #include "htNbCoherent.h"
 #include "htNbCoherentFam10.h"
@@ -66,7 +66,7 @@
 #include "htNbSystemFam10.h"
 #include "htNbUtilities.h"
 #include "htNbUtilitiesFam10.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbNonCoherentFam10.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbNonCoherentFam10.c
index 18d6da3..7c641fa 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbNonCoherentFam10.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbNonCoherentFam10.c
@@ -52,12 +52,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
-#include "htNb.h"
-#include "htNbHardwareFam10.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNbHardwareFam10.h>
 #include "htNbNonCoherentFam10.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbOptimizationFam10.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbOptimizationFam10.c
index 2ae1676..8518811 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbOptimizationFam10.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbOptimizationFam10.c
@@ -54,9 +54,9 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
-#include "htNb.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
 #include "htNbOptimizationFam10.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbSystemFam10.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbSystemFam10.c
index 5fee550..935f082 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbSystemFam10.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbSystemFam10.c
@@ -55,13 +55,13 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
-#include "htNb.h"
-#include "htNbHardwareFam10.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNbHardwareFam10.h>
 #include "htNbSystemFam10.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbUtilitiesFam10.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbUtilitiesFam10.c
index 5a089e1..cd241e6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbUtilitiesFam10.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam10/htNbUtilitiesFam10.c
@@ -55,12 +55,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
-#include "htNb.h"
-#include "htNbHardwareFam10.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNbHardwareFam10.h>
 #include "htNbUtilitiesFam10.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam14/htNbFam14.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam14/htNbFam14.c
index 3d4579a..e28cc46 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam14/htNbFam14.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam14/htNbFam14.c
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -23,10 +23,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -37,7 +37,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -50,15 +50,15 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionsHt.h"
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
-#include "htNb.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
 #include "CommonReturns.h"
 #include "htNbUtilitiesFam14.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 
 #define FILECODE PROC_HT_FAM14_HTNBFAM14_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam14/htNbUtilitiesFam14.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam14/htNbUtilitiesFam14.c
index b780b0b..932ea27 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Fam14/htNbUtilitiesFam14.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Fam14/htNbUtilitiesFam14.c
@@ -55,12 +55,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
-#include "htNb.h"
-#include "htNbHardwareFam10.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNbHardwareFam10.h>
 #include "htNbUtilitiesFam14.h"
 #include "Filecode.h"
 #define FILECODE PROC_HT_FAM14_HTNBUTILITIESFAM14_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatDynamicDiscovery.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatDynamicDiscovery.c
index d6f21aa..44db035 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatDynamicDiscovery.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatDynamicDiscovery.c
@@ -54,10 +54,10 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
 #include "htNotify.h"
-#include "htNb.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
 #include "htFeatDynamicDiscovery.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatGanging.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatGanging.c
index 0b0a745..42adfe7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatGanging.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatGanging.c
@@ -53,12 +53,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
-#include "htNb.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
 #include "htFeatGanging.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatNoncoherent.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatNoncoherent.c
index dbef5b8..26451a0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatNoncoherent.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatNoncoherent.c
@@ -54,13 +54,13 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
 #include "htNotify.h"
-#include "htNb.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
 #include "htFeatNoncoherent.h"
 #include "htFeatOptimization.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatOptimization.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatOptimization.c
index bcd669f..91fb273 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatOptimization.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatOptimization.c
@@ -55,13 +55,13 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "IdsHt.h"
 #include "htInterface.h"
-#include "htNb.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
 #include "htFeatOptimization.h"
 #include "htNotify.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatRouting.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatRouting.c
index cad0743..f4e60fa 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatRouting.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatRouting.c
@@ -57,10 +57,10 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
 #include "htNotify.h"
-#include "htNb.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
 #include "htGraph.h"
 #include "htFeatRouting.h"
 #include "htTopologies.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatSets.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatSets.c
index ec2f164..bd64812 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatSets.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatSets.c
@@ -52,11 +52,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionsHt.h"
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "CommonReturns.h"
 #include "htFeatDynamicDiscovery.h"
 #include "htFeatRouting.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatSublinks.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatSublinks.c
index 4c4d656..5c88ddf 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatSublinks.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatSublinks.c
@@ -55,9 +55,9 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "IdsHt.h"
 #include "htFeatSublinks.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatTrafficDistribution.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatTrafficDistribution.c
index 0513578..8937603 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatTrafficDistribution.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htFeatTrafficDistribution.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
-#include "htNb.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
 #include "htNotify.h"
 #include "htFeatTrafficDistribution.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htIds.c b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htIds.c
index 6820824..b6bda04 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htIds.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/Features/htIds.c
@@ -45,15 +45,15 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "IdsHt.h"
 #include "htInterface.h"
 #include "htInterfaceGeneral.h"
-#include "htNb.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbCoherent.c b/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbCoherent.c
index d1e923f..906e2e5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbCoherent.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbCoherent.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
-#include "htNb.h"
-#include "htNbHardwareFam10.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNbHardwareFam10.h>
 #include "htNbCoherent.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbNonCoherent.c b/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbNonCoherent.c
index 8fdd329..5d7f9c5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbNonCoherent.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbNonCoherent.c
@@ -52,12 +52,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
-#include "htNb.h"
-#include "htNbHardwareFam10.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNbHardwareFam10.h>
 #include "htNbNonCoherent.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbOptimization.c b/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbOptimization.c
index 7c8551b..8e86fb2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbOptimization.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbOptimization.c
@@ -52,16 +52,16 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "IdsHt.h"
 #include "htInterface.h"
 #include "htInterfaceGeneral.h"
 #include "htNotify.h"
-#include "htNb.h"
-#include "htNbHardwareFam10.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNbHardwareFam10.h>
 #include "htNbOptimization.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbUtilities.c b/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbUtilities.c
index 465066c..524fc9a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbUtilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/NbCommon/htNbUtilities.c
@@ -55,13 +55,13 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htNotify.h"
-#include "htNb.h"
-#include "htNbHardwareFam10.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNbHardwareFam10.h>
 #include "htNbUtilities.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/htFeat.c b/src/vendorcode/amd/agesa/f14/Proc/HT/htFeat.c
index 06a4b3c..613fc5a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/htFeat.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/htFeat.c
@@ -55,11 +55,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionsHt.h"
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "CommonReturns.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/htInterface.c b/src/vendorcode/amd/agesa/f14/Proc/HT/htInterface.c
index 01cdd13..b746c0d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/htInterface.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/htInterface.c
@@ -57,11 +57,11 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionsHt.h"
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
 #include "CommonReturns.h"
 #include "htInterfaceGeneral.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceCoherent.c b/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceCoherent.c
index 1d0172e..148f2dc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceCoherent.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceCoherent.c
@@ -55,15 +55,15 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
 #include "htInterfaceGeneral.h"
 #include "htInterfaceCoherent.h"
-#include "htNb.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceGeneral.c b/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceGeneral.c
index 74591f4..62c88da 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceGeneral.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceGeneral.c
@@ -55,17 +55,17 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionMultiSocket.h"
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
 #include "htInterfaceGeneral.h"
-#include "htNb.h"
-#include "cpuServices.h"
-#include "cpuFeatures.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceNonCoherent.c b/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceNonCoherent.c
index 20b1e1b..e293dd5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceNonCoherent.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/htInterfaceNonCoherent.c
@@ -55,13 +55,13 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
 #include "htInterfaceNonCoherent.h"
-#include "htNb.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/htMain.c b/src/vendorcode/amd/agesa/f14/Proc/HT/htMain.c
index 99de5c5..4d3f595 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/htMain.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/htMain.c
@@ -63,14 +63,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htInterface.h"
-#include "htNb.h"
-#include "heapManager.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "OptionsHt.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/htNb.c b/src/vendorcode/amd/agesa/f14/Proc/HT/htNb.c
index 4c22149..68e45cd 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/htNb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/htNb.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -52,17 +52,17 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionsHt.h"
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
-#include "htNb.h"
-#include "htNbHardwareFam10.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNb.h>
+#include <vendorcode/amd/agesa/f14/Proc/HT/htNbHardwareFam10.h>
 #include "CommonReturns.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/HT/htNotify.c b/src/vendorcode/amd/agesa/f14/Proc/HT/htNotify.c
index d64bada..cf8b8c6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/HT/htNotify.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/HT/htNotify.c
@@ -54,10 +54,10 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "Topology.h"
-#include "htFeat.h"
+#include <vendorcode/amd/agesa/f14/Proc/HT/htFeat.h>
 #include "htNotify.h"
 #include "GeneralServices.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/IDS/IdsLib.h b/src/vendorcode/amd/agesa/f14/Proc/IDS/IdsLib.h
index fe909be..7be220b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/IDS/IdsLib.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/IDS/IdsLib.h
@@ -16,7 +16,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -24,10 +24,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -38,7 +38,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -46,9 +46,9 @@
 #ifndef _IDS_LIB_H_
 #define _IDS_LIB_H_
 #include "OptionsIds.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "Table.h"
+#include <Proc/CPU/cpuRegisters.h>
+#include <Proc/CPU/cpuApicUtilities.h>
+#include <Proc/CPU/Table.h>
 ///Specific time stamp performance analysis which need ids control support
 #if IDSOPT_CONTROL_ENABLED == TRUE
   #define PERF_SPEC_TS_ANALYSE(StdHeader)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/C32/marc32_3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/C32/marc32_3.c
index 7e20815..709202b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/C32/marc32_3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/C32/marc32_3.c
@@ -48,12 +48,12 @@
 
 
 #include "AGESA.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/C32/mauc32_3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/C32/mauc32_3.c
index 5abc720..c6e4802 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/C32/mauc32_3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/C32/mauc32_3.c
@@ -49,13 +49,13 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/masda2.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/masda2.c
index e8ca7d2..c5a7cb1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/masda2.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/masda2.c
@@ -48,11 +48,11 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/masda3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/masda3.c
index 8ac6b4d..f34e332 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/masda3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/masda3.c
@@ -48,13 +48,13 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/mauda3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/mauda3.c
index 6913973..38aad17 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/mauda3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DA/mauda3.c
@@ -48,11 +48,11 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/mardr2.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/mardr2.c
index 6f2249b..d4329f6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/mardr2.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/mardr2.c
@@ -48,13 +48,13 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/mardr3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/mardr3.c
index 5335b49..96fafbc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/mardr3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/mardr3.c
@@ -48,12 +48,12 @@
 
 
 #include "AGESA.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/maudr3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/maudr3.c
index 6317e56..cdf3d80 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/maudr3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/DR/maudr3.c
@@ -48,11 +48,11 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/HY/marhy3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/HY/marhy3.c
index 8b87ea9..7825e0d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/HY/marhy3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/HY/marhy3.c
@@ -48,12 +48,12 @@
 
 
 #include "AGESA.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/HY/mauhy3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/HY/mauhy3.c
index fc5f3c6..c633fa4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/HY/mauhy3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/HY/mauhy3.c
@@ -49,13 +49,13 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/NI/masNi3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/NI/masNi3.c
index 1c27fc9..3f74144 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/NI/masNi3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/NI/masNi3.c
@@ -48,13 +48,13 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/NI/mauNi3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/NI/mauNi3.c
index 2d0e1e0..ebc822f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/NI/mauNi3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/NI/mauNi3.c
@@ -48,11 +48,11 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ON/mason3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ON/mason3.c
index c02c006..e2de2b1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ON/mason3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ON/mason3.c
@@ -48,12 +48,12 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 #define FILECODE PROC_MEM_ARDK_ON_MASON3_FILECODE
 /*----------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ON/mauon3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ON/mauon3.c
index 075aae1..efce26c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ON/mauon3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ON/mauon3.c
@@ -49,10 +49,10 @@
 
 #include "AGESA.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 #define FILECODE PROC_MEM_ARDK_ON_MAUON3_FILECODE
 /*----------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/PH/masph3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/PH/masph3.c
index 9da1e94..96d0089 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/PH/masph3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/PH/masph3.c
@@ -48,13 +48,13 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/PH/mauPh3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/PH/mauPh3.c
index 68954ed..196d4ad 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/PH/mauPh3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/PH/mauPh3.c
@@ -48,11 +48,11 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/RB/masRb3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/RB/masRb3.c
index 363c52b..db2984e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/RB/masRb3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/RB/masRb3.c
@@ -47,13 +47,13 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/RB/mauRb3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/RB/mauRb3.c
index fab9631..50bdcc2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/RB/mauRb3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/RB/mauRb3.c
@@ -47,11 +47,11 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ma.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ma.c
index b59bef8..846528d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ma.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ardk/ma.c
@@ -53,7 +53,7 @@
 
 
 #include "AGESA.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/CHINTLV/mfchi.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/CHINTLV/mfchi.c
index 1e74421..fc8f3cf 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/CHINTLV/mfchi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/CHINTLV/mfchi.c
@@ -55,8 +55,8 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mfchi.h"
 #include "Ids.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/CSINTLV/mfcsi.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/CSINTLV/mfcsi.c
index 0f22e1b..decfd72 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/CSINTLV/mfcsi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/CSINTLV/mfcsi.c
@@ -50,10 +50,10 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mfcsi.h"
 #include "Ids.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/DMI/mfDMI.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/DMI/mfDMI.c
index bcbee65..f7ea664 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/DMI/mfDMI.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/DMI/mfDMI.c
@@ -53,11 +53,11 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "heapManager.h"
-#include "cpuServices.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ECC/mfecc.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ECC/mfecc.c
index 4344e25..2cffd8c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ECC/mfecc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ECC/mfecc.c
@@ -45,13 +45,13 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mfecc.h"
 #include "Filecode.h"
-#include "mfmemclr.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfmemclr.h>
 #include "GeneralServices.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ECC/mfemp.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ECC/mfemp.c
index 75590ed..3cbd579 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ECC/mfemp.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ECC/mfemp.c
@@ -48,8 +48,8 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "Ids.h"
 #include "GeneralServices.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/EXCLUDIMM/mfdimmexclud.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/EXCLUDIMM/mfdimmexclud.c
index bcd069b..d1d5997 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/EXCLUDIMM/mfdimmexclud.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/EXCLUDIMM/mfdimmexclud.c
@@ -54,9 +54,9 @@
 
 #include "AGESA.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Ids.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/IDENDIMM/mfidendimm.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/IDENDIMM/mfidendimm.c
index f96841b..d8a9f0c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/IDENDIMM/mfidendimm.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/IDENDIMM/mfidendimm.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "mfidendimm.h"
 #include "GeneralServices.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/INTLVRN/mfintlvrn.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/INTLVRN/mfintlvrn.c
index b14d0e8..8fe4874 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/INTLVRN/mfintlvrn.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/INTLVRN/mfintlvrn.c
@@ -55,10 +55,10 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mfintlvrn.h"
 #include "Ids.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/LVDDR3/mflvddr3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/LVDDR3/mflvddr3.c
index bf503bf..59e0844 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/LVDDR3/mflvddr3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/LVDDR3/mflvddr3.c
@@ -54,11 +54,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/MEMCLR/mfmemclr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/MEMCLR/mfmemclr.c
index 6cbe11b..6a1a988 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/MEMCLR/mfmemclr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/MEMCLR/mfmemclr.c
@@ -48,11 +48,11 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
-#include "mfmemclr.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfmemclr.h>
 #include "Ids.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/NDINTLV/mfndi.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/NDINTLV/mfndi.c
index 3e7a20a..bc5c894 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/NDINTLV/mfndi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/NDINTLV/mfndi.c
@@ -55,9 +55,9 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mfndi.h"
 #include "Ids.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ODTHERMAL/mfodthermal.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ODTHERMAL/mfodthermal.c
index a3d95df..163e6e3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ODTHERMAL/mfodthermal.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/ODTHERMAL/mfodthermal.c
@@ -54,9 +54,9 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Ids.h"
 #include "mfodthermal.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/OLSPARE/mfspr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/OLSPARE/mfspr.c
index 5f83000..b905564 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/OLSPARE/mfspr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/OLSPARE/mfspr.c
@@ -54,11 +54,11 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mfspr.h"
 #include "Ids.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Filecode.h"
 #include "GeneralServices.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/PARTRN/mfParallelTraining.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/PARTRN/mfParallelTraining.c
index 4cc3771..9e0161c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/PARTRN/mfParallelTraining.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/PARTRN/mfParallelTraining.c
@@ -48,15 +48,15 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "mfParallelTraining.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfParallelTraining.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/PARTRN/mfStandardTraining.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/PARTRN/mfStandardTraining.c
index 9e64bcf..d229b63 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/PARTRN/mfStandardTraining.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/PARTRN/mfStandardTraining.c
@@ -48,11 +48,11 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Ids.h"
-#include "mfStandardTraining.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfStandardTraining.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/S3/mfs3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/S3/mfs3.c
index eee9804..e067e56 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/S3/mfs3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/S3/mfs3.c
@@ -54,18 +54,18 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
-#include "heapManager.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/TABLE/mftds.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/TABLE/mftds.c
index 89df264..79d33cc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/TABLE/mftds.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Feat/TABLE/mftds.c
@@ -47,11 +47,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 #include "Ids.h"
 #include "OptionMemory.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/C32/mmflowC32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/C32/mmflowC32.c
index 4e18e52..f1890be 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/C32/mmflowC32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/C32/mmflowC32.c
@@ -56,11 +56,11 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnc32.h"
-#include "mt.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #include "GeneralServices.h"
 CODE_GROUP (G1_PEICC)
@@ -68,7 +68,7 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_MEM_MAIN_C32_MMFLOWC32_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 
 extern MEM_FEAT_BLOCK_MAIN MemFeatMain;
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/DA/mmflowda.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/DA/mmflowda.c
index 3383e05..0124955 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/DA/mmflowda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/DA/mmflowda.c
@@ -56,11 +56,11 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnda.h"
-#include "mt.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #include "GeneralServices.h"
 CODE_GROUP (G1_PEICC)
@@ -68,7 +68,7 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_MEM_MAIN_DA_MMFLOWDA_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 
 extern MEM_FEAT_BLOCK_MAIN MemFeatMain;
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/DR/mmflowdr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/DR/mmflowdr.c
index 08af6d4..075e16c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/DR/mmflowdr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/DR/mmflowdr.c
@@ -56,11 +56,11 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mndr.h"
-#include "mt.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #include "GeneralServices.h"
 CODE_GROUP (G1_PEICC)
@@ -68,7 +68,7 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_MEM_MAIN_DR_MMFLOWDR_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 
 extern MEM_FEAT_BLOCK_MAIN MemFeatMain;
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/HY/mmflowhy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/HY/mmflowhy.c
index 7f7d1fb..4b23cb1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/HY/mmflowhy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/HY/mmflowhy.c
@@ -56,11 +56,11 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnhy.h"
-#include "mt.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #include "GeneralServices.h"
 CODE_GROUP (G1_PEICC)
@@ -68,7 +68,7 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_MEM_MAIN_HY_MMFLOWHY_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 
 extern MEM_FEAT_BLOCK_MAIN MemFeatMain;
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/ON/mmflowon.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/ON/mmflowon.c
index 2c0cb25..1a1ae3b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/ON/mmflowon.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/ON/mmflowon.c
@@ -56,17 +56,17 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mnon.h"
-#include "mt.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #include "GeneralServices.h"
 
 #define FILECODE PROC_MEM_MAIN_ON_MMFLOWON_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 
 extern MEM_FEAT_BLOCK_MAIN MemFeatMain;
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/PH/mmflowPh.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/PH/mmflowPh.c
index 8e21684..c4498b0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/PH/mmflowPh.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/PH/mmflowPh.c
@@ -56,12 +56,12 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnda.h"
 #include "mnPh.h"
-#include "mt.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #include "GeneralServices.h"
 CODE_GROUP (G1_PEICC)
@@ -69,7 +69,7 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_MEM_MAIN_PH_MMFLOWPH_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 
 extern MEM_FEAT_BLOCK_MAIN MemFeatMain;
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/RB/mmflowRb.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/RB/mmflowRb.c
index d8d5218..512e91f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/RB/mmflowRb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/RB/mmflowRb.c
@@ -56,12 +56,12 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnda.h"
 #include "mnRb.h"
-#include "mt.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #include "GeneralServices.h"
 CODE_GROUP (G1_PEICC)
@@ -69,7 +69,7 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_MEM_MAIN_RB_MMFLOWRB_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 
 extern MEM_FEAT_BLOCK_MAIN MemFeatMain;
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mdef.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mdef.c
index a280d40..3b15a5e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mdef.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mdef.c
@@ -55,7 +55,7 @@
 #include "AGESA.h"
 #include "AdvancedApi.h"
 #include "Filecode.h"
-#include "mm.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/merrhdl.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/merrhdl.c
index 0685f89..9ffbbab 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/merrhdl.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/merrhdl.c
@@ -52,14 +52,14 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "heapManager.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/minit.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/minit.c
index 7b6edc4..72b0d40 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/minit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/minit.c
@@ -53,12 +53,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "AdvancedApi.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "Ids.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mm.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mm.c
index 391b5df..14c09cf 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mm.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mm.c
@@ -54,16 +54,16 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmConditionalPso.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmConditionalPso.c
index d2477a3..ca3e0b5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmConditionalPso.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmConditionalPso.c
@@ -54,7 +54,7 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "Ids.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmEcc.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmEcc.c
index 1e30673..b60df48 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmEcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmEcc.c
@@ -55,13 +55,13 @@
 #include "Porting.h"
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "ma.h"
-#include "mfmemclr.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfmemclr.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmExcludeDimm.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmExcludeDimm.c
index 0b62c00..d7465eb 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmExcludeDimm.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmExcludeDimm.c
@@ -54,11 +54,11 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mport.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmLvDdr3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmLvDdr3.c
index d00f92f..3b479a2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmLvDdr3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmLvDdr3.c
@@ -54,10 +54,10 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mmlvddr3.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmMemClr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmMemClr.c
index a8f504b..8d2db08 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmMemClr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmMemClr.c
@@ -54,10 +54,10 @@
 
 #include "AGESA.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "Ids.h"
-#include "mfmemclr.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfmemclr.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmMemRestore.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmMemRestore.c
index 4a1ad29..4d36087 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmMemRestore.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmMemRestore.c
@@ -52,14 +52,14 @@
  */
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "Ids.h"
-#include "S3.h"
-#include "mfs3.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmNodeInterleave.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmNodeInterleave.c
index 62d2fda..d550cb0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmNodeInterleave.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmNodeInterleave.c
@@ -54,8 +54,8 @@
 
 #include "AGESA.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "Ids.h"
 #include "GeneralServices.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmOnlineSpare.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmOnlineSpare.c
index b19f60e..c9bbe9b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmOnlineSpare.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmOnlineSpare.c
@@ -54,8 +54,8 @@
 
 #include "AGESA.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "Ids.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmParallelTraining.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmParallelTraining.c
index 216c092..d14eacd 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmParallelTraining.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmParallelTraining.c
@@ -54,22 +54,22 @@
 
 #include "Porting.h"
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
-#include "cpuApicUtilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
 #include "GeneralServices.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "ma.h"
-#include "mu.h"
-#include "mfParallelTraining.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfParallelTraining.h>
 #include "GeneralServices.h"
-#include "heapManager.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmStandardTraining.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmStandardTraining.c
index b0376a4..c28680f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmStandardTraining.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmStandardTraining.c
@@ -55,12 +55,12 @@
 #include "Porting.h"
 #include "AGESA.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmUmaAlloc.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmUmaAlloc.c
index 755586a..eb3e3c3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmUmaAlloc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmUmaAlloc.c
@@ -53,13 +53,13 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "Ids.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmflow.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmflow.c
index 97fab2e..b4aaa22 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmflow.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mmflow.c
@@ -53,19 +53,19 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "OptionMemory.h"
 #include "AdvancedApi.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mu.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mu.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mu.c
index 3c83a06..558bc14 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mu.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mu.c
@@ -58,8 +58,8 @@
  */
  
 #include "AGESA.h"
-#include "amdlib.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Filecode.h" 
 
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/muc.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/muc.c
index 961ea1d..df966c3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/muc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/muc.c
@@ -54,15 +54,15 @@
 
 
 #include "AGESA.h"
-#include "cpuServices.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "Ids.h"
-#include "mport.h"
-#include "mu.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuCacheInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnParTrainc32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnParTrainc32.c
index b3f0a8e..d1fb956 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnParTrainc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnParTrainc32.c
@@ -53,19 +53,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnc32.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuApicUtilities.h"
-#include "mfParallelTraining.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfParallelTraining.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnS3c32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnS3c32.c
index 25103e3..9252e8a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnS3c32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnS3c32.c
@@ -55,19 +55,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
 #include "mnc32.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mnS3c32.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnc32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnc32.c
index a9e9e2d..aebca0d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnc32.c
@@ -55,18 +55,18 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnc32.h"
-#include "mu.h"
-#include "S3.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mndctc32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mndctc32.c
index 8dfc9e2..46c29f7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mndctc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mndctc32.c
@@ -56,14 +56,14 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnc32.h"
-#include "merrhdl.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnflowc32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnflowc32.c
index 2785673..02f3275 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnflowc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnflowc32.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mnc32.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnidendimmc32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnidendimmc32.c
index 84a997e..fb9ac9c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnidendimmc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnidendimmc32.c
@@ -54,14 +54,14 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnc32.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnmctc32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnmctc32.c
index 7561ad6..b2d1b65 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnmctc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnmctc32.c
@@ -54,11 +54,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnc32.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnotc32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnotc32.c
index 164d7f4..1cfaf6e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnotc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnotc32.c
@@ -55,8 +55,8 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnc32.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnphyc32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnphyc32.c
index b05090b..ec87e3b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnphyc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnphyc32.c
@@ -55,12 +55,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnc32.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnregc32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnregc32.c
index c4ae310..7b6bb68 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnregc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnregc32.c
@@ -53,16 +53,16 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnc32.h"
-#include "merrhdl.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnParTrainDa.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnParTrainDa.c
index 2f149a2..0e8dead 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnParTrainDa.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnParTrainDa.c
@@ -53,19 +53,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnda.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuApicUtilities.h"
-#include "mfParallelTraining.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfParallelTraining.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnS3da.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnS3da.c
index 77d4428..26d9975 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnS3da.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnS3da.c
@@ -55,19 +55,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
 #include "mnda.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mnS3da.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnda.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnda.c
index b7fb2f3..51befeb 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnda.c
@@ -54,18 +54,18 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnda.h"
-#include "mu.h"
-#include "S3.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mndctda.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mndctda.c
index f56d02a..2299752 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mndctda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mndctda.c
@@ -55,20 +55,20 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnda.h"
-#include "merrhdl.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "Filecode.h"
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuRegisters.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "F10PackageType.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnflowda.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnflowda.c
index 15dbcf1..f9e7a78 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnflowda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnflowda.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mnda.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnidendimmda.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnidendimmda.c
index 9d83e03..f246462 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnidendimmda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnidendimmda.c
@@ -54,14 +54,14 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnda.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnmctda.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnmctda.c
index 5aecdb7..5c73bbb 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnmctda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnmctda.c
@@ -54,11 +54,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnda.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnotda.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnotda.c
index 22d34ce..10f26ac 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnotda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnotda.c
@@ -55,8 +55,8 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnda.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnprotoda.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnprotoda.c
index ef042d3..92cb816 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnprotoda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnprotoda.c
@@ -47,8 +47,8 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnda.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnregda.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnregda.c
index 2de8daf..99fd1b6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnregda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnregda.c
@@ -54,16 +54,16 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnda.h"
-#include "merrhdl.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnParTrainDr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnParTrainDr.c
index 17a8427..ec4b6a5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnParTrainDr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnParTrainDr.c
@@ -53,19 +53,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mndr.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuApicUtilities.h"
-#include "mfParallelTraining.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfParallelTraining.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnS3dr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnS3dr.c
index a9b75d9..bebeb54 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnS3dr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnS3dr.c
@@ -55,19 +55,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
 #include "mndr.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mnS3dr.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mndctdr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mndctdr.c
index f776b5e..903f7a1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mndctdr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mndctdr.c
@@ -55,17 +55,17 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mndr.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "OptionMemory.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mndr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mndr.c
index 20925d5..615e61f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mndr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mndr.c
@@ -54,19 +54,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mndr.h"
-#include "mu.h"
-#include "merrhdl.h"
-#include "S3.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnflowdr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnflowdr.c
index 8c3a9aa..1677038 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnflowdr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnflowdr.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mndr.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
@@ -67,7 +67,7 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_MEM_NB_DR_MNFLOWDR_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 /*----------------------------------------------------------------------------
  *                          DEFINITIONS AND MACROS
  *
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnidendimmdr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnidendimmdr.c
index 440da5a..347d802 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnidendimmdr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnidendimmdr.c
@@ -54,14 +54,14 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mndr.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnmctdr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnmctdr.c
index e42fa23..da86c77 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnmctdr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnmctdr.c
@@ -54,14 +54,14 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mndr.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "GeneralServices.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnotdr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnotdr.c
index d8ee691..297d21c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnotdr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnotdr.c
@@ -55,8 +55,8 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mndr.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnprotodr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnprotodr.c
index b30d604..93d053a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnprotodr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnprotodr.c
@@ -47,12 +47,12 @@
 
 
 #include "AGESA.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mndr.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnregdr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnregdr.c
index 056c317..35fd4a5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnregdr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnregdr.c
@@ -54,17 +54,17 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mndr.h"
-#include "merrhdl.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnParTrainHy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnParTrainHy.c
index 8a44436..e15a90a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnParTrainHy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnParTrainHy.c
@@ -53,19 +53,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnhy.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuApicUtilities.h"
-#include "mfParallelTraining.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfParallelTraining.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnS3hy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnS3hy.c
index da2084f..f2dd288 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnS3hy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnS3hy.c
@@ -55,19 +55,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
 #include "mnhy.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mnS3hy.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mndcthy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mndcthy.c
index 6048818..9159600 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mndcthy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mndcthy.c
@@ -56,14 +56,14 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnhy.h"
-#include "merrhdl.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnflowhy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnflowhy.c
index da281cd..9ce482c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnflowhy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnflowhy.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mnhy.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnhy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnhy.c
index 58a4dc9..24b830e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnhy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnhy.c
@@ -55,18 +55,18 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnhy.h"
-#include "mu.h"
-#include "S3.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnidendimmhy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnidendimmhy.c
index 9fe91a6..2d0d35f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnidendimmhy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnidendimmhy.c
@@ -54,14 +54,14 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnhy.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnmcthy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnmcthy.c
index c58618e..0610808 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnmcthy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnmcthy.c
@@ -54,11 +54,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnhy.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnothy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnothy.c
index ef5cdb7..aae9b5d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnothy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnothy.c
@@ -55,8 +55,8 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnhy.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnphyhy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnphyhy.c
index 9720ed8..a37f57f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnphyhy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnphyhy.c
@@ -55,13 +55,13 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "ma.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnhy.h"
 #include "PlatformMemoryConfiguration.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnreghy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnreghy.c
index ff5ed1d..f242531 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnreghy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnreghy.c
@@ -53,16 +53,16 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnhy.h"
-#include "merrhdl.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnNi.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnNi.c
index 4736fa8..e7ad8dc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnNi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnNi.c
@@ -54,19 +54,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnda.h"
 #include "mnNi.h"
-#include "mu.h"
-#include "S3.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnS3Ni.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnS3Ni.c
index c366760..8d75cf6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnS3Ni.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnS3Ni.c
@@ -55,19 +55,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
 #include "mnda.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mnS3Ni.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnflowNi.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnflowNi.c
index 8deb690..f78b7e4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnflowNi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/NI/mnflowNi.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mnda.h"
 #include "mnNi.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnS3on.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnS3on.c
index 4af0dfb..397fd58 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnS3on.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnS3on.c
@@ -55,21 +55,21 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
-#include "mnon.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "GeneralServices.h"
-#include "cpuCommonF14Utilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.h>
 #include "mnS3on.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 #define FILECODE PROC_MEM_NB_ON_MNS3ON_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mndcton.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mndcton.c
index a3afd55..0db61b3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mndcton.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mndcton.c
@@ -55,18 +55,18 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
-#include "mnon.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "GeneralServices.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuCommonF14Utilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.h>
 #include "Filecode.h"
 #define FILECODE PROC_MEM_NB_ON_MNDCTON_FILECODE
 /*----------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnflowon.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnflowon.c
index f6f170d..11926c6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnflowon.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnflowon.c
@@ -55,18 +55,18 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mnon.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 #include "GeneralServices.h"
 #define FILECODE PROC_MEM_NB_ON_MNFLOWON_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 /*----------------------------------------------------------------------------
  *                          DEFINITIONS AND MACROS
  *
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnidendimmon.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnidendimmon.c
index 718e52b..c9e68bc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnidendimmon.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnidendimmon.c
@@ -54,14 +54,14 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
-#include "mnon.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.h>
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 #define FILECODE PROC_MEM_NB_ON_MNIDENDIMMON_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnmcton.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnmcton.c
index 6a0ae76..7d07509 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnmcton.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnmcton.c
@@ -54,14 +54,14 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
-#include "mnon.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 #define FILECODE PROC_MEM_NB_ON_MNMCTON_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.c
index 17a2019..529da51 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.c
@@ -54,19 +54,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mnon.h"
-#include "mu.h"
-#include "merrhdl.h"
-#include "S3.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 #define FILECODE PROC_MEM_NB_ON_MNON_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnoton.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnoton.c
index 3fe33d6..7b4836b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnoton.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnoton.c
@@ -55,11 +55,11 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
-#include "mnon.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Filecode.h"
 #define FILECODE PROC_MEM_NB_ON_MNOTON_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnphyon.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnphyon.c
index e20b8cc..a82a89e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnphyon.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnphyon.c
@@ -55,15 +55,15 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mu.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
-#include "mnon.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.h>
 #include "Filecode.h"
 #define FILECODE PROC_MEM_NB_ON_MNPHYON_FILECODE
 /*----------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnprotoon.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnprotoon.c
index 7f60a98..467cc9f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnprotoon.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnprotoon.c
@@ -47,11 +47,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "AdvancedApi.h"
 #include "Filecode.h"
 #define FILECODE PROC_MEM_NB_ON_MNPROTOON_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnregon.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnregon.c
index f85e56d..4f6ed06 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnregon.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnregon.c
@@ -54,17 +54,17 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mnon.h"
-#include "merrhdl.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnon.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 #define FILECODE PROC_MEM_NB_ON_MNREGON_FILECODE
 /*----------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnPh.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnPh.c
index 61c9449..78f0594 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnPh.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnPh.c
@@ -54,19 +54,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnda.h"
 #include "mnPh.h"
-#include "mu.h"
-#include "S3.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnS3Ph.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnS3Ph.c
index e20479b..216fd73 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnS3Ph.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnS3Ph.c
@@ -55,20 +55,20 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
 #include "mnda.h"
 #include "mnPh.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mnS3Ph.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnflowPh.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnflowPh.c
index beac73d..d92d961 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnflowPh.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnflowPh.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mnda.h"
 #include "mnPh.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnidendimmPh.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnidendimmPh.c
index 3c946e9..7507c3c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnidendimmPh.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/PH/mnidendimmPh.c
@@ -54,15 +54,15 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnda.h"
 #include "mnPh.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnRb.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnRb.c
index ba3baf0..c09e899 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnRb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnRb.c
@@ -54,19 +54,19 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mnda.h"
 #include "mnRb.h"
-#include "mu.h"
-#include "S3.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnS3Rb.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnS3Rb.c
index 755a4e3..d9b9aa1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnS3Rb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnS3Rb.c
@@ -55,20 +55,20 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
 #include "mnda.h"
 #include "mnRb.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mnS3Rb.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnflowRb.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnflowRb.c
index 3138c27..0523a5a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnflowRb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnflowRb.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mnda.h"
 #include "mnRb.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnidendimmRb.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnidendimmRb.c
index ce1f1c2..895f4a4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnidendimmRb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/RB/mnidendimmRb.c
@@ -54,15 +54,15 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "OptionMemory.h"       // need def for MEM_FEAT_BLOCK_NB
 #include "mnda.h"
 #include "mnRb.h"
 #include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuFamRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mn.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mn.c
index 5624527..28ca5a7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mn.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mn.c
@@ -52,13 +52,13 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnS3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnS3.c
index b6ed940..1c1e5c6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnS3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnS3.c
@@ -53,15 +53,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "S3.h"
-#include "mfs3.h"
-#include "cpuFamilyTranslation.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/S3.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mfs3.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mndct.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mndct.c
index ac10349..babb87e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mndct.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mndct.c
@@ -55,15 +55,15 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mu.h"
-#include "mftds.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnfeat.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnfeat.c
index d806fa5..9b0bdab 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnfeat.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnfeat.c
@@ -53,14 +53,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "PlatformMemoryConfiguration.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnflow.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnflow.c
index 8e7f503..a75a300 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnflow.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnflow.c
@@ -54,19 +54,19 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_MEM_NB_MNFLOW_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 /*----------------------------------------------------------------------------
  *                          DEFINITIONS AND MACROS
  *
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnmct.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnmct.c
index 613aadd..8fd89a1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnmct.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnmct.c
@@ -54,17 +54,17 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
-#include "cpuFeatures.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnphy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnphy.c
index bcf2f6e..ed5d503 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnphy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnphy.c
@@ -55,16 +55,16 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "PlatformMemoryConfiguration.h"
-#include "heapManager.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnreg.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnreg.c
index 8abe261..50162e2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnreg.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnreg.c
@@ -54,11 +54,11 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 #include "GeneralServices.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mntrain2.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mntrain2.c
index f8b10be..bdb65ca 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mntrain2.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mntrain2.c
@@ -54,19 +54,19 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_MEM_NB_MNTRAIN2_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 /*----------------------------------------------------------------------------
  *                          DEFINITIONS AND MACROS
  *
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mntrain3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mntrain3.c
index 3835224..27bb32b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mntrain3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mntrain3.c
@@ -54,19 +54,19 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_MEM_NB_MNTRAIN3_FILECODE
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 /*----------------------------------------------------------------------------
  *                          DEFINITIONS AND MACROS
  *
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/C32/mprc32_3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/C32/mprc32_3.c
index 9113812..108b687 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/C32/mprc32_3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/C32/mprc32_3.c
@@ -47,14 +47,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/C32/mpuc32_3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/C32/mpuc32_3.c
index 7866eed..bde2788 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/C32/mpuc32_3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/C32/mpuc32_3.c
@@ -47,13 +47,13 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpsda2.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpsda2.c
index c69a526..eb8e1a0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpsda2.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpsda2.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpsda3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpsda3.c
index 981b8cd..036e44c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpsda3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpsda3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpuda3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpuda3.c
index aad019a..9c819fe 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpuda3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DA/mpuda3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mprdr2.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mprdr2.c
index 2b59c8b..5f6fe42 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mprdr2.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mprdr2.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mprdr3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mprdr3.c
index f26f0c8..261196c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mprdr3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mprdr3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpsdr3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpsdr3.c
index 6de04d9..5e4bcee 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpsdr3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpsdr3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpudr2.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpudr2.c
index 66fe7d1..0a912a5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpudr2.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpudr2.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpudr3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpudr3.c
index 1d3acbb..bb0a69c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpudr3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/DR/mpudr3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mprhy3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mprhy3.c
index 7e4764c..f0df1bf 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mprhy3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mprhy3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "GeneralServices.h"
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mpshy3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mpshy3.c
index 2943777..20b3447 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mpshy3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mpshy3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mpuhy3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mpuhy3.c
index 344b04b..865568a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mpuhy3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/HY/mpuhy3.c
@@ -50,13 +50,13 @@
 #include "AGESA.h"
 #include "AdvancedApi.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/NI/mpsNi3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/NI/mpsNi3.c
index c6a8e23..9be7328 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/NI/mpsNi3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/NI/mpsNi3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/NI/mpuNi3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/NI/mpuNi3.c
index c922816..515a63d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/NI/mpuNi3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/NI/mpuNi3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/ON/mpson3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/ON/mpson3.c
index 18298b8..19acb43 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/ON/mpson3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/ON/mpson3.c
@@ -47,13 +47,13 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "PlatformMemoryConfiguration.h"
 #include "Filecode.h"
 #define FILECODE PROC_MEM_PS_ON_MPSON3_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/ON/mpuon3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/ON/mpuon3.c
index 41f0df0..d41eef2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/ON/mpuon3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/ON/mpuon3.c
@@ -48,13 +48,13 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "AdvancedApi.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "PlatformMemoryConfiguration.h"
-#include "ma.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 #define FILECODE PROC_MEM_PS_ON_MPUON3_FILECODE
 /*----------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/PH/mpsph3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/PH/mpsph3.c
index 755abf5..3f35963 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/PH/mpsph3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/PH/mpsph3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/PH/mpuph3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/PH/mpuph3.c
index bcbff94..49ae8fd 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/PH/mpuph3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/PH/mpuph3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/RB/mpsRb3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/RB/mpsRb3.c
index 2e1ffdc..b80ebf6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/RB/mpsRb3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/RB/mpsRb3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/RB/mpuRb3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/RB/mpuRb3.c
index ebe4f25..b88fd3d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/RB/mpuRb3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/RB/mpuRb3.c
@@ -49,14 +49,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "mport.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mp.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mp.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mp.c
index 6e4e77a..9080c81 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mp.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mp.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplribt.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplribt.c
index c86ba86..96ecc05 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplribt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplribt.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplrnlr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplrnlr.c
index b2a12b9..9502f5f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplrnlr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplrnlr.c
@@ -54,13 +54,13 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplrnpr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplrnpr.c
index 3bea942..7681977 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplrnpr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mplrnpr.c
@@ -54,13 +54,13 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpmaxfreq.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpmaxfreq.c
index 3351364..e0e0204 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpmaxfreq.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpmaxfreq.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpmr0.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpmr0.c
index 5819a58..621bff2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpmr0.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpmr0.c
@@ -54,13 +54,13 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpodtpat.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpodtpat.c
index c3c41b6..bf5398c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpodtpat.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpodtpat.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprc10opspd.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprc10opspd.c
index 0c3ed5d..52c6ea6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprc10opspd.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprc10opspd.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprc2ibt.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprc2ibt.c
index a1a0c81..4d22a90 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprc2ibt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprc2ibt.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprtt.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprtt.c
index 5c635ad..8088870 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprtt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mprtt.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpsao.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpsao.c
index b0b2cc9..9cb63db 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpsao.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Ps/mpsao.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mt2.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mt2.c
index 9a68725..bd2ab77 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mt2.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mt2.c
@@ -56,10 +56,10 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "AdvancedApi.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mt2.h"
 #include "mtspd2.h"
 #include "mtot2.h"
@@ -70,7 +70,7 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 /* features */
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 #define FILECODE PROC_MEM_TECH_DDR2_MT2_FILECODE
 
 /*----------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mtot2.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mtot2.c
index 4e6e5fb..f264a7b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mtot2.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mtot2.c
@@ -54,10 +54,10 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mtot2.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mtspd2.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mtspd2.c
index f9aeeed..6bf3c73 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mtspd2.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR2/mtspd2.c
@@ -55,16 +55,16 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "mt2.h"
 #include "mtspd2.h"
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mt3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mt3.c
index b1ab754..dc5afd5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mt3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mt3.c
@@ -55,10 +55,10 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mt3.h"
 #include "mtspd3.h"
 #include "mtot3.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtlrdimm3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtlrdimm3.c
index 4775def..1ba3dc2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtlrdimm3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtlrdimm3.c
@@ -53,18 +53,18 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mt3.h"
 #include "mtspd3.h"
 #include "mtrci3.h"
 #include "mtsdi3.h"
 #include "mtlrdimm3.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtot3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtot3.c
index 2163ccf..6036635 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtot3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtot3.c
@@ -55,10 +55,10 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mtot3.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtrci3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtrci3.c
index 21c8ad9..1ce8768 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtrci3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtrci3.c
@@ -55,13 +55,13 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mt3.h"
 #include "mtrci3.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtsdi3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtsdi3.c
index 48dc007..e31f100 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtsdi3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtsdi3.c
@@ -56,14 +56,14 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mt3.h"
 #include "mtsdi3.h"
 #include "mtrci3.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtspd3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtspd3.c
index c2f9372..32f8df3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtspd3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mtspd3.c
@@ -56,14 +56,14 @@
 #include "AGESA.h"
 #include "AdvancedApi.h"
 #include "Ids.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mt3.h"
-#include "mu.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
 #include "mtspd3.h"
-#include "mftds.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mftds.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mttecc3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mttecc3.c
index 5f94873..2d95529 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mttecc3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mttecc3.c
@@ -53,10 +53,10 @@
 
 
 #include "AGESA.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mttwl3.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mttwl3.c
index 34e0927..70ce0be 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mttwl3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/DDR3/mttwl3.c
@@ -55,12 +55,12 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mtsdi3.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mt.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mt.c
index 70fa039..b4ad73c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mt.c
@@ -53,12 +53,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
-#include "mport.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mthdi.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mthdi.c
index 0a95b9b..e35d5eb 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mthdi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mthdi.c
@@ -55,10 +55,10 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttEdgeDetect.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttEdgeDetect.c
index f87ebb1..e7a841f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttEdgeDetect.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttEdgeDetect.c
@@ -56,18 +56,18 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "AdvancedApi.h"
 #include "GeneralServices.h"
 #include "Ids.h"
-#include "heapManager.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
-#include "mport.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mport.h>
 #include "mttEdgeDetect.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttdimbt.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttdimbt.c
index ced3d93..e3b2174 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttdimbt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttdimbt.c
@@ -55,12 +55,12 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "GeneralServices.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttecc.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttecc.c
index 01d5c29..3353f72 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttecc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttecc.c
@@ -54,10 +54,10 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mtthrc.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mtthrc.c
index ecfa3db..8e93205 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mtthrc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mtthrc.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttml.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttml.c
index 06d583f..72b44c9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttml.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttml.c
@@ -55,11 +55,11 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "GeneralServices.h"
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttoptsrc.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttoptsrc.c
index 5043657..63618f7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttoptsrc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttoptsrc.c
@@ -56,11 +56,11 @@
 #include "AGESA.h"
 #include "AdvancedApi.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttsrc.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttsrc.c
index 1686bac..d5e335a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttsrc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Tech/mttsrc.c
@@ -56,12 +56,12 @@
 #include "AGESA.h"
 #include "AdvancedApi.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mu.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "GeneralServices.h"
-#include "merrhdl.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/merrhdl.h>
 #include "Filecode.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.c
index 67140cd..d101d92 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.c
@@ -51,9 +51,9 @@
 
 #include "AGESA.h"
 #include "cpuRecovery.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
-#include "Table.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Table.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GnbRecovery.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GnbRecovery.c
index 0c787d9..2eed4c5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GnbRecovery.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GnbRecovery.c
@@ -50,7 +50,7 @@
  */
 
 #include  "AGESA.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
 #include  GNB_MODULE_DEFINITIONS (GnbNbInitLibV1)
 #include  "NbInitRecovery.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/NbInitRecovery.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/NbInitRecovery.c
index d4b831d..87b5759 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/NbInitRecovery.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/NbInitRecovery.c
@@ -49,10 +49,10 @@
  *----------------------------------------------------------------------------------------
  */
 #include  "AGESA.h"
-#include  "amdlib.h"
-#include  "Gnb.h"
+#include  <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h>
 #include  GNB_MODULE_DEFINITIONS (GnbCommonLib)
-#include  "GnbRegistersON.h"
+#include  <vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbRegistersON.h>
 #include  "Filecode.h"
 #define FILECODE PROC_RECOVERY_GNB_NBINITRECOVERY_FILECODE
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/HT/htInitRecovery.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/HT/htInitRecovery.c
index f034b1a..aad8dc0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/HT/htInitRecovery.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/HT/htInitRecovery.c
@@ -49,7 +49,7 @@
 #include "AGESA.h"
 #include "Ids.h"
 #include "Topology.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/HT/htInitReset.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/HT/htInitReset.c
index 9d58026..fa1da35 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/HT/htInitReset.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/HT/htInitReset.c
@@ -56,7 +56,7 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "AdvancedApi.h"
 #include "GeneralServices.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/C32/mrnc32.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/C32/mrnc32.c
index 7176417..fb646f2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/C32/mrnc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/C32/mrnc32.c
@@ -54,16 +54,16 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mrnc32.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/C32/mrnmctc32.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/C32/mrnmctc32.c
index bc22a8c..771ce23 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/C32/mrnmctc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/C32/mrnmctc32.c
@@ -54,11 +54,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mrnc32.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DA/mrnda.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DA/mrnda.c
index 8281f61..dcb7f6f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DA/mrnda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DA/mrnda.c
@@ -54,16 +54,16 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mrnda.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DA/mrnmctda.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DA/mrnmctda.c
index 3cb2cfd..3cd015d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DA/mrnmctda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DA/mrnmctda.c
@@ -54,11 +54,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mrnda.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DR/mrndr.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DR/mrndr.c
index e30f2b7..bfd2aa8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DR/mrndr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DR/mrndr.c
@@ -54,16 +54,16 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mrndr.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DR/mrnmctdr.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DR/mrnmctdr.c
index 8ca2fae..21bb05c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DR/mrnmctdr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/DR/mrnmctdr.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mrndr.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrndcthy.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrndcthy.c
index c908382..56cc250 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrndcthy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrndcthy.c
@@ -58,9 +58,9 @@
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mru.h"
 #include "mrnhy.h"
 #include "Filecode.h"
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrnhy.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrnhy.c
index 453308a..c9bc2e2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrnhy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrnhy.c
@@ -54,16 +54,16 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mrnhy.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrnmcthy.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrnmcthy.c
index 60fbc9a..7d36ede 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrnmcthy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/HY/mrnmcthy.c
@@ -54,11 +54,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mrnhy.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/NI/mrnNi.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/NI/mrnNi.c
index 1ed06f4..cf3122e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/NI/mrnNi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/NI/mrnNi.c
@@ -54,17 +54,17 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mrnda.h"
 #include "mrnNi.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrndcton.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrndcton.c
index 03ef12e..d05a2dc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrndcton.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrndcton.c
@@ -58,14 +58,14 @@
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "Ids.h"
-#include "amdlib.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mru.h"
 #include "mrnon.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuCommonF14Utilities.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.h>
 #include "Filecode.h"
 #define FILECODE PROC_RECOVERY_MEM_NB_ON_MRNDCTON_FILECODE
 /*----------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnmcton.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnmcton.c
index b181e4a..75b2dcb 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnmcton.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnmcton.c
@@ -54,12 +54,12 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mrnon.h"
 #include "Filecode.h"
 #define FILECODE PROC_RECOVERY_MEM_NB_ON_MRNMCTON_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnon.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnon.c
index 5c3e778..5f7a9fa 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnon.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnon.c
@@ -54,17 +54,17 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
 #include "mrport.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mrnon.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 #define FILECODE PROC_RECOVERY_MEM_NB_ON_MRNON_FILECODE
 /*----------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/PH/mrnPh.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/PH/mrnPh.c
index 0552cd5..c73e498 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/PH/mrnPh.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/PH/mrnPh.c
@@ -54,17 +54,17 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mrnda.h"
 #include "mrnPh.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/RB/mrnRb.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/RB/mrnRb.c
index 627e5f7..df7bad2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/RB/mrnRb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/RB/mrnRb.c
@@ -54,17 +54,17 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mrnda.h"
 #include "mrnRb.h"
-#include "heapManager.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrn.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrn.c
index c4baec0..8c6b644 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrn.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrn.c
@@ -54,13 +54,13 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
-#include "cpuFamilyTranslation.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "Filecode.h"
 #define FILECODE PROC_RECOVERY_MEM_NB_MRN_FILECODE
 /*----------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrndct.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrndct.c
index 2769e1c..db0685e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrndct.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrndct.c
@@ -59,12 +59,12 @@
 #include "PlatformMemoryConfiguration.h"
 #include "Ids.h"
 #include "mrport.h"
-#include "cpuFamRegisters.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mru.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Filecode.h"
 #define FILECODE PROC_RECOVERY_MEM_NB_MRNDCT_FILECODE
 /*----------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrnmct.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrnmct.c
index 88029b6..e44e19c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrnmct.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrnmct.c
@@ -54,14 +54,14 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "cpuFamilyTranslation.h"
-#include "cpuCacheInit.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheInit.h>
 #include "Filecode.h"
 #define FILECODE PROC_RECOVERY_MEM_NB_MRNMCT_FILECODE
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrntrain3.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrntrain3.c
index 393cb7c..721bca9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrntrain3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/mrntrain3.c
@@ -54,13 +54,13 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
 #include "OptionMemory.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mrt3.h"
 #include "Filecode.h"
 #define FILECODE PROC_RECOVERY_MEM_NB_MRNTRAIN3_FILECODE
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrp.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrp.c
index ab42a87..78c5ae6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrp.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrp.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "mru.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplribt.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplribt.c
index 32a78c1..9f033cd 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplribt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplribt.c
@@ -54,14 +54,14 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "mru.h"
-#include "ma.h"
-#include "mp.h"
-#include "cpuFamRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplrnlr.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplrnlr.c
index 3169e21..4396361 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplrnlr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplrnlr.c
@@ -54,13 +54,13 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "mru.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplrnpr.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplrnpr.c
index ac934e5..e78aaeb 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplrnpr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrplrnpr.c
@@ -54,13 +54,13 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "mru.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpmr0.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpmr0.c
index da78b20..9813ccd 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpmr0.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpmr0.c
@@ -54,13 +54,13 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "mu.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mu.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpodtpat.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpodtpat.c
index 7b981d9..3cdb209 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpodtpat.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpodtpat.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "mru.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprc10opspd.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprc10opspd.c
index 5a2c1e0..d8438dd 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprc10opspd.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprc10opspd.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "mru.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprc2ibt.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprc2ibt.c
index 99aa5c3..294a32d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprc2ibt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprc2ibt.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "mru.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprtt.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprtt.c
index 523f729..34826f9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprtt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrprtt.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "mru.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpsao.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpsao.c
index 034217b..fbe2cb0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpsao.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Ps/mrpsao.c
@@ -54,15 +54,15 @@
 
 #include "AGESA.h"
 #include "AdvancedApi.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "cpuFamRegisters.h"
-#include "cpuRegisters.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h>
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "mru.h"
-#include "ma.h"
-#include "mp.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mp.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrt3.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrt3.c
index 4f59351..0d1ede9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrt3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrt3.c
@@ -54,11 +54,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mrt3.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtrci3.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtrci3.c
index 0d3e1de..dfe240f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtrci3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtrci3.c
@@ -56,10 +56,10 @@
 #include "AGESA.h"
 #include "OptionMemory.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mru.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtsdi3.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtsdi3.c
index 9ced115..76f5840 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtsdi3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtsdi3.c
@@ -57,10 +57,10 @@
 #include "AGESA.h"
 #include "OptionMemory.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mru.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mrt3.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtspd3.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtspd3.c
index 7d20e45..dcbe90f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtspd3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrtspd3.c
@@ -54,11 +54,11 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mrtspd3.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrttwl3.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrttwl3.c
index 5e1ad00..9cbeb17 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrttwl3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/DDR3/mrttwl3.c
@@ -57,10 +57,10 @@
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
 #include "Ids.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mru.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "mrt3.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrtthrc.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrtthrc.c
index 3fbfc6b..eafda78 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrtthrc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrtthrc.c
@@ -55,13 +55,13 @@
 
 #include "AGESA.h"
 #include "OptionMemory.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mru.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "PlatformMemoryConfiguration.h"
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrttpos.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrttpos.c
index dda47ec..4d10573 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrttpos.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrttpos.c
@@ -55,10 +55,10 @@
 
 
 #include "AGESA.h"
-#include "amdlib.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrttsrc.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrttsrc.c
index afa9379..e35c6af 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrttsrc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/Tech/mrttsrc.c
@@ -55,13 +55,13 @@
 
 #include "AGESA.h"
 #include "OptionMemory.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
-#include "mm.h"
-#include "mn.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
 #include "mru.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mrinit.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mrinit.c
index b2970ff..a47b0fc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mrinit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mrinit.c
@@ -54,8 +54,8 @@
 #include "AGESA.h"
 #include "OptionMemory.h"
 #include "Ids.h"
-#include "mm.h"
-#include "ma.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/ma.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mrm.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mrm.c
index cc84e47..a663947 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mrm.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mrm.c
@@ -54,14 +54,14 @@
 
 #include "AGESA.h"
 #include "Ids.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "GeneralServices.h"
-#include "heapManager.h"
-#include "cpuServices.h"
+#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h>
 #include "OptionMemoryRecovery.h"
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mm.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mn.h>
+#include <vendorcode/amd/agesa/f14/Proc/Mem/mt.h>
 #include "Filecode.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mruc.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mruc.c
index 95fc64b..a1ea9f1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mruc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/mruc.c
@@ -55,7 +55,7 @@
 #include "AGESA.h"
 #include "OptionMemory.h"
 #include "PlatformMemoryConfiguration.h"
-#include "amdlib.h"
+#include <vendorcode/amd/agesa/f14/Lib/amdlib.h>
 #include "Ids.h"
 #include "mrport.h"
 #include "mru.h"



More information about the coreboot-gerrit mailing list