diff --git a/src/vendorcode/amd/agesa/f15/Legacy/Proc/Makefile.inc b/src/vendorcode/amd/agesa/f15/Legacy/Proc/Makefile.inc
new file mode 100644
index 0000000..80cdf12
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Legacy/Proc/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += Dispatcher.c
+libagesa-y += agesaCallouts.c
+libagesa-y += hobTransfer.c
diff --git a/src/vendorcode/amd/agesa/f15/Makefile.inc b/src/vendorcode/amd/agesa/f15/Makefile.inc
index e0ae4a1..2ea4c33 100644
--- a/src/vendorcode/amd/agesa/f15/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f15/Makefile.inc
@@ -61,368 +61,8 @@
 
 #######################################################################
 
-libagesa-y += Legacy/Proc/agesaCallouts.c
-libagesa-y += Legacy/Proc/Dispatcher.c
-libagesa-y += Legacy/Proc/hobTransfer.c
-libagesa-y += Proc/Common/AmdInitEarly.c
-libagesa-y += Proc/Common/AmdInitEnv.c
-libagesa-y += Proc/Common/AmdInitLate.c
-libagesa-y += Proc/Common/AmdInitMid.c
-libagesa-y += Proc/Common/AmdInitPost.c
-libagesa-y += Proc/Common/AmdInitReset.c
-libagesa-y += Proc/Common/AmdInitResume.c
-libagesa-y += Proc/Common/AmdLateRunApTask.c
-libagesa-y += Proc/Common/AmdS3LateRestore.c
-libagesa-y += Proc/Common/AmdS3Save.c
-libagesa-y += Proc/Common/CommonInits.c
-libagesa-y += Proc/Common/CommonReturns.c
-libagesa-y += Proc/Common/CreateStruct.c
-libagesa-y += Proc/Common/S3RestoreState.c
-libagesa-y += Proc/Common/S3SaveState.c
-libagesa-y += Proc/CPU/cahaltasm.S
-libagesa-y += Proc/CPU/cahalt.c
-libagesa-y += Proc/CPU/cpuApicUtilities.c
-libagesa-y += Proc/CPU/cpuBist.c
-libagesa-y += Proc/CPU/cpuBrandId.c
-libagesa-y += Proc/CPU/cpuEarlyInit.c
-libagesa-y += Proc/CPU/cpuEventLog.c
-libagesa-y += Proc/CPU/cpuFamilyTranslation.c
-libagesa-y += Proc/CPU/cpuGeneralServices.c
-libagesa-y += Proc/CPU/cpuInitEarlyTable.c
-libagesa-y += Proc/CPU/cpuLateInit.c
-libagesa-y += Proc/CPU/cpuMicrocodePatch.c
-libagesa-y += Proc/CPU/cpuPostInit.c
-libagesa-y += Proc/CPU/cpuPowerMgmt.c
-libagesa-y += Proc/CPU/cpuPowerMgmtMultiSocket.c
-libagesa-y += Proc/CPU/cpuPowerMgmtSingleSocket.c
-libagesa-y += Proc/CPU/cpuWarmReset.c
-libagesa-y += Proc/CPU/heapManager.c
-libagesa-y += Proc/CPU/S3.c
-libagesa-y += Proc/CPU/Table.c
-libagesa-y += Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10BrandId.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10Cpb.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10Dmi.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10EarlyInit.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10MsrTables.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10PciTables.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10PowerCheck.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10PowerPlane.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10Pstate.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10Utilities.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
-libagesa-y += Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
-libagesa-y += Proc/CPU/Family/0x10/F10InitEarlyTable.c
-libagesa-y += Proc/CPU/Family/0x10/F10IoCstate.c
-libagesa-y += Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
-libagesa-y += Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
-libagesa-y += Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
-libagesa-y += Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
-libagesa-y += Proc/CPU/Family/0x10/F10PmNbPstateInit.c
-libagesa-y += Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
-libagesa-y += Proc/CPU/Family/0x15/cpuCommonF15Utilities.c
-libagesa-y += Proc/CPU/Family/0x15/cpuF15Apm.c
-libagesa-y += Proc/CPU/Family/0x15/cpuF15BrandId.c
-libagesa-y += Proc/CPU/Family/0x15/cpuF15CacheDefaults.c
-libagesa-y += Proc/CPU/Family/0x15/cpuF15Dmi.c
-libagesa-y += Proc/CPU/Family/0x15/cpuF15MsrTables.c
-libagesa-y += Proc/CPU/Family/0x15/cpuF15PciTables.c
-libagesa-y += Proc/CPU/Family/0x15/cpuF15PowerCheck.c
-libagesa-y += Proc/CPU/Family/0x15/cpuF15Utilities.c
-libagesa-y += Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c
-libagesa-y += Proc/CPU/Family/0x15/F15PstateHpcMode.c
-libagesa-y += Proc/CPU/Family/0x15/OR/cpuF15OrCacheFlushOnHalt.c
-libagesa-y += Proc/CPU/Family/0x15/OR/cpuF15OrCoreAfterReset.c
-libagesa-y += Proc/CPU/Family/0x15/OR/cpuF15OrDmi.c
-libagesa-y += Proc/CPU/Family/0x15/OR/cpuF15OrFeatureLeveling.c
-libagesa-y += Proc/CPU/Family/0x15/OR/cpuF15OrNbAfterReset.c
-libagesa-y += Proc/CPU/Family/0x15/OR/cpuF15OrPstate.c
-libagesa-y += Proc/CPU/Family/0x15/OR/cpuF15OrSoftwareThermal.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrC6State.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrCpb.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrEarlySamples.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrEquivalenceTable.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrHtPhyTables.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrInitEarlyTable.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrIoCstate.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrL3Features.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrLogicalIdTables.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrLowPwrPstate.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000425.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch0600050D_Enc.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000624_Enc.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrMicrocodePatchTables.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrMsgBasedC1e.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrMsrTables.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrMultiLinkPciTables.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrPciTables.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrPmNbCofVidInit.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrPowerMgmtSystemTables.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrPowerPlane.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrSharedMsrTable.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrSingleLinkPciTables.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrUtilities.c
-libagesa-y += Proc/CPU/Family/0x15/OR/F15OrWorkaroundsTable.c
-libagesa-y += Proc/CPU/Feature/cpuApm.c
-libagesa-y += Proc/CPU/Feature/cpuC6State.c
-libagesa-y += Proc/CPU/Feature/cpuCacheFlushOnHalt.c
-libagesa-y += Proc/CPU/Feature/cpuCacheInit.c
-libagesa-y += Proc/CPU/Feature/cpuCoreLeveling.c
-libagesa-y += Proc/CPU/Feature/cpuCpb.c
-libagesa-y += Proc/CPU/Feature/cpuDmi.c
-libagesa-y += Proc/CPU/Feature/cpuFeatureLeveling.c
-libagesa-y += Proc/CPU/Feature/cpuFeatures.c
-libagesa-y += Proc/CPU/Feature/cpuHwC1e.c
-libagesa-y += Proc/CPU/Feature/cpuIoCstate.c
-libagesa-y += Proc/CPU/Feature/cpuL3Features.c
-libagesa-y += Proc/CPU/Feature/cpuLowPwrPstate.c
-libagesa-y += Proc/CPU/Feature/cpuMsgBasedC1e.c
-libagesa-y += Proc/CPU/Feature/cpuPstateGather.c
-libagesa-y += Proc/CPU/Feature/cpuPstateHpcMode.c
-libagesa-y += Proc/CPU/Feature/cpuPstateLeveling.c
-libagesa-y += Proc/CPU/Feature/cpuPstateTables.c
-libagesa-y += Proc/CPU/Feature/cpuSlit.c
-libagesa-y += Proc/CPU/Feature/cpuSrat.c
-libagesa-y += Proc/CPU/Feature/cpuSwC1e.c
-libagesa-y += Proc/CPU/Feature/cpuWhea.c
-libagesa-y += Proc/CPU/Feature/PreserveMailbox.c
-libagesa-y += Proc/HT/htFeat.c
-libagesa-y += Proc/HT/htInterface.c
-libagesa-y += Proc/HT/htInterfaceCoherent.c
-libagesa-y += Proc/HT/htInterfaceGeneral.c
-libagesa-y += Proc/HT/htInterfaceNonCoherent.c
-libagesa-y += Proc/HT/htMain.c
-libagesa-y += Proc/HT/htNb.c
-libagesa-y += Proc/HT/htNotify.c
-libagesa-y += Proc/HT/Fam10/htNbCoherentFam10.c
-libagesa-y += Proc/HT/Fam10/htNbFam10.c
-libagesa-y += Proc/HT/Fam10/htNbNonCoherentFam10.c
-libagesa-y += Proc/HT/Fam10/htNbOptimizationFam10.c
-libagesa-y += Proc/HT/Fam10/htNbSystemFam10.c
-libagesa-y += Proc/HT/Fam10/htNbUtilitiesFam10.c
-libagesa-y += Proc/HT/Fam15/htNbCoherentFam15.c
-libagesa-y += Proc/HT/Fam15/htNbFam15.c
-libagesa-y += Proc/HT/Fam15/htNbNonCoherentFam15.c
-libagesa-y += Proc/HT/Fam15/htNbOptimizationFam15.c
-libagesa-y += Proc/HT/Fam15/htNbSystemFam15.c
-libagesa-y += Proc/HT/Fam15/htNbUtilitiesFam15.c
-libagesa-y += Proc/HT/Features/htFeatDynamicDiscovery.c
-libagesa-y += Proc/HT/Features/htFeatGanging.c
-libagesa-y += Proc/HT/Features/htFeatNoncoherent.c
-libagesa-y += Proc/HT/Features/htFeatOptimization.c
-libagesa-y += Proc/HT/Features/htFeatRouting.c
-libagesa-y += Proc/HT/Features/htFeatSets.c
-libagesa-y += Proc/HT/Features/htFeatSublinks.c
-libagesa-y += Proc/HT/Features/htFeatTrafficDistribution.c
-libagesa-y += Proc/HT/Features/htIds.c
-libagesa-y += Proc/HT/htGraph/htGraph.c
-libagesa-y += Proc/HT/htGraph/htGraph1.c
-libagesa-y += Proc/HT/htGraph/htGraph2.c
-libagesa-y += Proc/HT/htGraph/htGraph3Line.c
-libagesa-y += Proc/HT/htGraph/htGraph3Triangle.c
-libagesa-y += Proc/HT/htGraph/htGraph4Degenerate.c
-libagesa-y += Proc/HT/htGraph/htGraph4FullyConnected.c
-libagesa-y += Proc/HT/htGraph/htGraph4Kite.c
-libagesa-y += Proc/HT/htGraph/htGraph4Line.c
-libagesa-y += Proc/HT/htGraph/htGraph4Square.c
-libagesa-y += Proc/HT/htGraph/htGraph4Star.c
-libagesa-y += Proc/HT/htGraph/htGraph5FullyConnected.c
-libagesa-y += Proc/HT/htGraph/htGraph5TwistedLadder.c
-libagesa-y += Proc/HT/htGraph/htGraph6DoubloonLower.c
-libagesa-y += Proc/HT/htGraph/htGraph6DoubloonUpper.c
-libagesa-y += Proc/HT/htGraph/htGraph6FullyConnected.c
-libagesa-y += Proc/HT/htGraph/htGraph6TwinTriangles.c
-libagesa-y += Proc/HT/htGraph/htGraph6TwistedLadder.c
-libagesa-y += Proc/HT/htGraph/htGraph7FullyConnected.c
-libagesa-y += Proc/HT/htGraph/htGraph7TwistedLadder.c
-libagesa-y += Proc/HT/htGraph/htGraph8DoubloonM.c
-libagesa-y += Proc/HT/htGraph/htGraph8FullyConnected.c
-libagesa-y += Proc/HT/htGraph/htGraph8Ladder.c
-libagesa-y += Proc/HT/htGraph/htGraph8TwinFullyFourWays.c
-libagesa-y += Proc/HT/htGraph/htGraph8TwistedLadder.c
-libagesa-y += Proc/HT/NbCommon/htNbCoherent.c
-libagesa-y += Proc/HT/NbCommon/htNbNonCoherent.c
-libagesa-y += Proc/HT/NbCommon/htNbOptimization.c
-libagesa-y += Proc/HT/NbCommon/htNbUtilities.c
-libagesa-y += Proc/Mem/Ardk/ma.c
-libagesa-y += Proc/Mem/Ardk/C32/marc32_3.c
-libagesa-y += Proc/Mem/Ardk/C32/mauc32_3.c
-libagesa-y += Proc/Mem/Ardk/HY/marhy3.c
-libagesa-y += Proc/Mem/Ardk/HY/mauhy3.c
-libagesa-y += Proc/Mem/Ardk/OR/maror3.c
-libagesa-y += Proc/Mem/Ardk/OR/mauor3.c
-libagesa-y += Proc/Mem/Feat/CHINTLV/mfchi.c
-libagesa-y += Proc/Mem/Feat/CSINTLV/mfcsi.c
-libagesa-y += Proc/Mem/Feat/DMI/mfDMI.c
-libagesa-y += Proc/Mem/Feat/ECC/mfecc.c
-libagesa-y += Proc/Mem/Feat/ECC/mfemp.c
-libagesa-y += Proc/Mem/Feat/EXCLUDIMM/mfdimmexclud.c
-libagesa-y += Proc/Mem/Feat/IDENDIMM/mfidendimm.c
-libagesa-y += Proc/Mem/Feat/INTLVRN/mfintlvrn.c
-libagesa-y += Proc/Mem/Feat/LVDDR3/mflvddr3.c
-libagesa-y += Proc/Mem/Feat/MEMCLR/mfmemclr.c
-libagesa-y += Proc/Mem/Feat/NDINTLV/mfndi.c
-libagesa-y += Proc/Mem/Feat/ODTHERMAL/mfodthermal.c
-libagesa-y += Proc/Mem/Feat/OLSPARE/mfspr.c
-libagesa-y += Proc/Mem/Feat/PARTRN/mfParallelTraining.c
-libagesa-y += Proc/Mem/Feat/PARTRN/mfStandardTraining.c
-libagesa-y += Proc/Mem/Feat/S3/mfs3.c
-libagesa-y += Proc/Mem/Feat/TABLE/mftds.c
-libagesa-y += Proc/Mem/Main/mdef.c
-libagesa-y += Proc/Mem/Main/merrhdl.c
-libagesa-y += Proc/Mem/Main/minit.c
-libagesa-y += Proc/Mem/Main/mm.c
-libagesa-y += Proc/Mem/Main/mmConditionalPso.c
-libagesa-y += Proc/Mem/Main/mmEcc.c
-libagesa-y += Proc/Mem/Main/mmExcludeDimm.c
-libagesa-y += Proc/Mem/Main/mmLvDdr3.c
-libagesa-y += Proc/Mem/Main/mmMemClr.c
-libagesa-y += Proc/Mem/Main/mmMemRestore.c
-libagesa-y += Proc/Mem/Main/mmNodeInterleave.c
-libagesa-y += Proc/Mem/Main/mmOnlineSpare.c
-libagesa-y += Proc/Mem/Main/mmParallelTraining.c
-libagesa-y += Proc/Mem/Main/mmStandardTraining.c
-libagesa-y += Proc/Mem/Main/mmUmaAlloc.c
-libagesa-y += Proc/Mem/Main/mu.c
-libagesa-y += Proc/Mem/Main/muc.c
-libagesa-y += Proc/Mem/NB/mn.c
-libagesa-y += Proc/Mem/NB/mndct.c
-libagesa-y += Proc/Mem/NB/mnfeat.c
-libagesa-y += Proc/Mem/NB/mnflow.c
-libagesa-y += Proc/Mem/NB/mnmct.c
-libagesa-y += Proc/Mem/NB/mnphy.c
-libagesa-y += Proc/Mem/NB/mnreg.c
-libagesa-y += Proc/Mem/NB/mnS3.c
-libagesa-y += Proc/Mem/NB/mntrain3.c
-libagesa-y += Proc/Mem/NB/C32/mnc32.c
-libagesa-y += Proc/Mem/NB/C32/mndctc32.c
-libagesa-y += Proc/Mem/NB/C32/mnflowc32.c
-libagesa-y += Proc/Mem/NB/C32/mnidendimmc32.c
-libagesa-y += Proc/Mem/NB/C32/mnmctc32.c
-libagesa-y += Proc/Mem/NB/C32/mnotc32.c
-libagesa-y += Proc/Mem/NB/C32/mnParTrainc32.c
-libagesa-y += Proc/Mem/NB/C32/mnphyc32.c
-libagesa-y += Proc/Mem/NB/C32/mnprotoc32.c
-libagesa-y += Proc/Mem/NB/C32/mnregc32.c
-libagesa-y += Proc/Mem/NB/C32/mnS3c32.c
-libagesa-y += Proc/Mem/NB/HY/mndcthy.c
-libagesa-y += Proc/Mem/NB/HY/mnflowhy.c
-libagesa-y += Proc/Mem/NB/HY/mnhy.c
-libagesa-y += Proc/Mem/NB/HY/mnidendimmhy.c
-libagesa-y += Proc/Mem/NB/HY/mnmcthy.c
-libagesa-y += Proc/Mem/NB/HY/mnothy.c
-libagesa-y += Proc/Mem/NB/HY/mnParTrainHy.c
-libagesa-y += Proc/Mem/NB/HY/mnphyhy.c
-libagesa-y += Proc/Mem/NB/HY/mnprotohy.c
-libagesa-y += Proc/Mem/NB/HY/mnreghy.c
-libagesa-y += Proc/Mem/NB/HY/mnS3hy.c
-libagesa-y += Proc/Mem/NB/OR/mndctor.c
-libagesa-y += Proc/Mem/NB/OR/mnflowor.c
-libagesa-y += Proc/Mem/NB/OR/mnidendimmor.c
-libagesa-y += Proc/Mem/NB/OR/mnmctor.c
-libagesa-y += Proc/Mem/NB/OR/mnor.c
-libagesa-y += Proc/Mem/NB/OR/mnotor.c
-libagesa-y += Proc/Mem/NB/OR/mnpartrainor.c
-libagesa-y += Proc/Mem/NB/OR/mnphyor.c
-libagesa-y += Proc/Mem/NB/OR/mnprotoor.c
-libagesa-y += Proc/Mem/NB/OR/mnregor.c
-libagesa-y += Proc/Mem/NB/OR/mns3or.c
-libagesa-y += Proc/Mem/Ps/mp.c
-libagesa-y += Proc/Mem/Ps/mplribt.c
-libagesa-y += Proc/Mem/Ps/mplrnlr.c
-libagesa-y += Proc/Mem/Ps/mplrnpr.c
-libagesa-y += Proc/Mem/Ps/mpmaxfreq.c
-libagesa-y += Proc/Mem/Ps/mpmr0.c
-libagesa-y += Proc/Mem/Ps/mpodtpat.c
-libagesa-y += Proc/Mem/Ps/mprc10opspd.c
-libagesa-y += Proc/Mem/Ps/mprc2ibt.c
-libagesa-y += Proc/Mem/Ps/mprtt.c
-libagesa-y += Proc/Mem/Ps/mps2d.c
-libagesa-y += Proc/Mem/Ps/mpsao.c
-libagesa-y += Proc/Mem/Ps/mpseeds.c
-libagesa-y += Proc/Mem/Ps/C32/mprc32_3.c
-libagesa-y += Proc/Mem/Ps/C32/mpuc32_3.c
-libagesa-y += Proc/Mem/Ps/HY/mprhy3.c
-libagesa-y += Proc/Mem/Ps/HY/mpshy3.c
-libagesa-y += Proc/Mem/Ps/HY/mpuhy3.c
-libagesa-y += Proc/Mem/Tech/mt.c
-libagesa-y += Proc/Mem/Tech/mthdi.c
-libagesa-y += Proc/Mem/Tech/mttdimbt.c
-libagesa-y += Proc/Mem/Tech/mttecc.c
-libagesa-y += Proc/Mem/Tech/mttEdgeDetect.c
-libagesa-y += Proc/Mem/Tech/mtthrc.c
-libagesa-y += Proc/Mem/Tech/mtthrcSeedTrain.c
-libagesa-y += Proc/Mem/Tech/mttml.c
-libagesa-y += Proc/Mem/Tech/mttoptsrc.c
-libagesa-y += Proc/Mem/Tech/mttsrc.c
-libagesa-y += Proc/Mem/Tech/DDR3/mt3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mtlrdimm3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mtot3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mtrci3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mtsdi3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mtspd3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mttecc3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mttwl3.c
-libagesa-y += Proc/Recovery/HT/htInitRecovery.c
-libagesa-y += Proc/Recovery/HT/htInitReset.c
-
-libagesa-y += Proc/Mem/Main/mmflow.c
-libagesa-y += Proc/Mem/Main/OR/mmflowor.c
-libagesa-y += Proc/Mem/Ps/OR/mpor3.c
-
-ifeq ($(CONFIG_CPU_AMD_SOCKET_C32), y)
-	libagesa-y += Proc/Mem/Main/C32/mmflowC32.c
-	libagesa-y += Proc/Mem/Ps/OR/C32/mpLorC3.c
-	libagesa-y += Proc/Mem/Ps/OR/C32/mpRorC3.c
-	libagesa-y += Proc/Mem/Ps/OR/C32/mpUorC3.c
-
-#	libagesa-y += Proc/Mem/Main/HY/mmflowhy.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000d9.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/F10RevDL3Features.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
-endif
-
-ifeq ($(CONFIG_CPU_AMD_SOCKET_G34), y)
-	libagesa-y += Proc/Mem/Main/HY/mmflowhy.c
-	libagesa-y += Proc/Mem/Ps/OR/G34/mpLorG3.c
-	libagesa-y += Proc/Mem/Ps/OR/G34/mpRorG3.c
-	libagesa-y += Proc/Mem/Ps/OR/G34/mpUorG3.c
-
-	libagesa-y += Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000d9.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/F10RevDL3Features.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
-	libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
-endif
+subdirs-y += Legacy/Proc
+subdirs-y += $(dir $(shell cd $(dir); find Proc -name Makefile.inc))
 
 $(obj)/libagesa.fam15.a: $$(libagesa-objs)
 	@printf "    AGESA        $(subst $(obj)/,,$(@))\n"
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/Makefile.inc
new file mode 100644
index 0000000..75f7c1c
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/Makefile.inc
@@ -0,0 +1,34 @@
+libagesa-y += F10InitEarlyTable.c
+libagesa-y += F10IoCstate.c
+libagesa-y += F10MultiLinkPciTables.c
+libagesa-y += F10PmAsymBoostInit.c
+libagesa-y += F10PmDualPlaneOnlySupport.c
+libagesa-y += F10PmNbCofVidInit.c
+libagesa-y += F10PmNbPstateInit.c
+libagesa-y += F10SingleLinkPciTables.c
+libagesa-y += cpuCommonF10Utilities.c
+libagesa-y += cpuF10BrandId.c
+libagesa-y += cpuF10BrandIdAm3.c
+libagesa-y += cpuF10BrandIdAsb2.c
+libagesa-y += cpuF10BrandIdC32.c
+libagesa-y += cpuF10BrandIdFr1207.c
+libagesa-y += cpuF10BrandIdG34.c
+libagesa-y += cpuF10BrandIdS1g3.c
+libagesa-y += cpuF10BrandIdS1g4.c
+libagesa-y += cpuF10CacheDefaults.c
+libagesa-y += cpuF10CacheFlushOnHalt.c
+libagesa-y += cpuF10Cpb.c
+libagesa-y += cpuF10Dmi.c
+libagesa-y += cpuF10EarlyInit.c
+libagesa-y += cpuF10FeatureLeveling.c
+libagesa-y += cpuF10HtPhyTables.c
+libagesa-y += cpuF10MsrTables.c
+libagesa-y += cpuF10PciTables.c
+libagesa-y += cpuF10PowerCheck.c
+libagesa-y += cpuF10PowerMgmtSystemTables.c
+libagesa-y += cpuF10PowerPlane.c
+libagesa-y += cpuF10Pstate.c
+libagesa-y += cpuF10SoftwareThermal.c
+libagesa-y += cpuF10Utilities.c
+libagesa-y += cpuF10WheaInitDataTables.c
+libagesa-y += cpuF10WorkaroundsTable.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/Makefile.inc
new file mode 100644
index 0000000..4883524
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/Makefile.inc
@@ -0,0 +1,14 @@
+libagesa-y += F10HyEquivalenceTable.c
+libagesa-y += F10HyEquivalenceTable.c
+libagesa-y += F10HyHtPhyTables.c
+libagesa-y += F10HyHtPhyTables.c
+libagesa-y += F10HyInitEarlyTable.c
+libagesa-y += F10HyInitEarlyTable.c
+libagesa-y += F10HyLogicalIdTables.c
+libagesa-y += F10HyLogicalIdTables.c
+libagesa-y += F10HyMicrocodePatchTables.c
+libagesa-y += F10HyMicrocodePatchTables.c
+libagesa-y += F10HyMsrTables.c
+libagesa-y += F10HyMsrTables.c
+libagesa-y += F10HyPciTables.c
+libagesa-y += F10HyPciTables.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/Makefile.inc
new file mode 100644
index 0000000..508a631
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/Makefile.inc
@@ -0,0 +1,10 @@
+libagesa-y += F10MicrocodePatch010000c5.c
+libagesa-y += F10MicrocodePatch010000c5.c
+libagesa-y += F10MicrocodePatch010000d9.c
+libagesa-y += F10MicrocodePatch010000d9.c
+libagesa-y += F10RevDL3Features.c
+libagesa-y += F10RevDL3Features.c
+libagesa-y += F10RevDMsgBasedC1e.c
+libagesa-y += F10RevDMsgBasedC1e.c
+libagesa-y += F10RevDUtilities.c
+libagesa-y += F10RevDUtilities.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/Makefile.inc
new file mode 100644
index 0000000..a08d8e4
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/Makefile.inc
@@ -0,0 +1,11 @@
+libagesa-y += F15PstateHpcMode.c
+libagesa-y += cpuCommonF15Utilities.c
+libagesa-y += cpuF15Apm.c
+libagesa-y += cpuF15BrandId.c
+libagesa-y += cpuF15CacheDefaults.c
+libagesa-y += cpuF15Dmi.c
+libagesa-y += cpuF15MsrTables.c
+libagesa-y += cpuF15PciTables.c
+libagesa-y += cpuF15PowerCheck.c
+libagesa-y += cpuF15Utilities.c
+libagesa-y += cpuF15WheaInitDataTables.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/Makefile.inc
new file mode 100644
index 0000000..f28c5f7
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/Makefile.inc
@@ -0,0 +1,32 @@
+libagesa-y += F15OrC6State.c
+libagesa-y += F15OrCpb.c
+libagesa-y += F15OrEarlySamples.c
+libagesa-y += F15OrEquivalenceTable.c
+libagesa-y += F15OrHtPhyTables.c
+libagesa-y += F15OrInitEarlyTable.c
+libagesa-y += F15OrIoCstate.c
+libagesa-y += F15OrL3Features.c
+libagesa-y += F15OrLogicalIdTables.c
+libagesa-y += F15OrLowPwrPstate.c
+libagesa-y += F15OrMicrocodePatch06000425.c
+libagesa-y += F15OrMicrocodePatch0600050D_Enc.c
+libagesa-y += F15OrMicrocodePatch06000624_Enc.c
+libagesa-y += F15OrMicrocodePatchTables.c
+libagesa-y += F15OrMsgBasedC1e.c
+libagesa-y += F15OrMsrTables.c
+libagesa-y += F15OrMultiLinkPciTables.c
+libagesa-y += F15OrPciTables.c
+libagesa-y += F15OrPmNbCofVidInit.c
+libagesa-y += F15OrPowerMgmtSystemTables.c
+libagesa-y += F15OrPowerPlane.c
+libagesa-y += F15OrSharedMsrTable.c
+libagesa-y += F15OrSingleLinkPciTables.c
+libagesa-y += F15OrUtilities.c
+libagesa-y += F15OrWorkaroundsTable.c
+libagesa-y += cpuF15OrCacheFlushOnHalt.c
+libagesa-y += cpuF15OrCoreAfterReset.c
+libagesa-y += cpuF15OrDmi.c
+libagesa-y += cpuF15OrFeatureLeveling.c
+libagesa-y += cpuF15OrNbAfterReset.c
+libagesa-y += cpuF15OrPstate.c
+libagesa-y += cpuF15OrSoftwareThermal.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/Makefile.inc
new file mode 100644
index 0000000..0607c99
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/Makefile.inc
@@ -0,0 +1,23 @@
+libagesa-y += PreserveMailbox.c
+libagesa-y += cpuApm.c
+libagesa-y += cpuC6State.c
+libagesa-y += cpuCacheFlushOnHalt.c
+libagesa-y += cpuCacheInit.c
+libagesa-y += cpuCoreLeveling.c
+libagesa-y += cpuCpb.c
+libagesa-y += cpuDmi.c
+libagesa-y += cpuFeatureLeveling.c
+libagesa-y += cpuFeatures.c
+libagesa-y += cpuHwC1e.c
+libagesa-y += cpuIoCstate.c
+libagesa-y += cpuL3Features.c
+libagesa-y += cpuLowPwrPstate.c
+libagesa-y += cpuMsgBasedC1e.c
+libagesa-y += cpuPstateGather.c
+libagesa-y += cpuPstateHpcMode.c
+libagesa-y += cpuPstateLeveling.c
+libagesa-y += cpuPstateTables.c
+libagesa-y += cpuSlit.c
+libagesa-y += cpuSrat.c
+libagesa-y += cpuSwC1e.c
+libagesa-y += cpuWhea.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/CPU/Makefile.inc
new file mode 100644
index 0000000..239af76
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Makefile.inc
@@ -0,0 +1,20 @@
+libagesa-y += S3.c
+libagesa-y += Table.c
+libagesa-y += cahalt.c
+libagesa-y += cahaltasm.S
+libagesa-y += cpuApicUtilities.c
+libagesa-y += cpuBist.c
+libagesa-y += cpuBrandId.c
+libagesa-y += cpuEarlyInit.c
+libagesa-y += cpuEventLog.c
+libagesa-y += cpuFamilyTranslation.c
+libagesa-y += cpuGeneralServices.c
+libagesa-y += cpuInitEarlyTable.c
+libagesa-y += cpuLateInit.c
+libagesa-y += cpuMicrocodePatch.c
+libagesa-y += cpuPostInit.c
+libagesa-y += cpuPowerMgmt.c
+libagesa-y += cpuPowerMgmtMultiSocket.c
+libagesa-y += cpuPowerMgmtSingleSocket.c
+libagesa-y += cpuWarmReset.c
+libagesa-y += heapManager.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Common/Makefile.inc
new file mode 100644
index 0000000..957c98f
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/Makefile.inc
@@ -0,0 +1,15 @@
+libagesa-y += AmdInitEarly.c
+libagesa-y += AmdInitEnv.c
+libagesa-y += AmdInitLate.c
+libagesa-y += AmdInitMid.c
+libagesa-y += AmdInitPost.c
+libagesa-y += AmdInitReset.c
+libagesa-y += AmdInitResume.c
+libagesa-y += AmdLateRunApTask.c
+libagesa-y += AmdS3LateRestore.c
+libagesa-y += AmdS3Save.c
+libagesa-y += CommonInits.c
+libagesa-y += CommonReturns.c
+libagesa-y += CreateStruct.c
+libagesa-y += S3RestoreState.c
+libagesa-y += S3SaveState.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/HT/Fam10/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/HT/Fam10/Makefile.inc
new file mode 100644
index 0000000..e57f165
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/HT/Fam10/Makefile.inc
@@ -0,0 +1,6 @@
+libagesa-y += htNbCoherentFam10.c
+libagesa-y += htNbFam10.c
+libagesa-y += htNbNonCoherentFam10.c
+libagesa-y += htNbOptimizationFam10.c
+libagesa-y += htNbSystemFam10.c
+libagesa-y += htNbUtilitiesFam10.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/HT/Fam15/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/HT/Fam15/Makefile.inc
new file mode 100644
index 0000000..ae6cae4
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/HT/Fam15/Makefile.inc
@@ -0,0 +1,6 @@
+libagesa-y += htNbCoherentFam15.c
+libagesa-y += htNbFam15.c
+libagesa-y += htNbNonCoherentFam15.c
+libagesa-y += htNbOptimizationFam15.c
+libagesa-y += htNbSystemFam15.c
+libagesa-y += htNbUtilitiesFam15.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/HT/Features/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/HT/Features/Makefile.inc
new file mode 100644
index 0000000..8d4cac7
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/HT/Features/Makefile.inc
@@ -0,0 +1,9 @@
+libagesa-y += htFeatDynamicDiscovery.c
+libagesa-y += htFeatGanging.c
+libagesa-y += htFeatNoncoherent.c
+libagesa-y += htFeatOptimization.c
+libagesa-y += htFeatRouting.c
+libagesa-y += htFeatSets.c
+libagesa-y += htFeatSublinks.c
+libagesa-y += htFeatTrafficDistribution.c
+libagesa-y += htIds.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/HT/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/HT/Makefile.inc
new file mode 100644
index 0000000..f54568a
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/HT/Makefile.inc
@@ -0,0 +1,8 @@
+libagesa-y += htFeat.c
+libagesa-y += htInterface.c
+libagesa-y += htInterfaceCoherent.c
+libagesa-y += htInterfaceGeneral.c
+libagesa-y += htInterfaceNonCoherent.c
+libagesa-y += htMain.c
+libagesa-y += htNb.c
+libagesa-y += htNotify.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/HT/NbCommon/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/HT/NbCommon/Makefile.inc
new file mode 100644
index 0000000..17944aa
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/HT/NbCommon/Makefile.inc
@@ -0,0 +1,4 @@
+libagesa-y += htNbCoherent.c
+libagesa-y += htNbNonCoherent.c
+libagesa-y += htNbOptimization.c
+libagesa-y += htNbUtilities.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/HT/htGraph/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/HT/htGraph/Makefile.inc
new file mode 100644
index 0000000..fceb584
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/HT/htGraph/Makefile.inc
@@ -0,0 +1,25 @@
+libagesa-y += htGraph.c
+libagesa-y += htGraph1.c
+libagesa-y += htGraph2.c
+libagesa-y += htGraph3Line.c
+libagesa-y += htGraph3Triangle.c
+libagesa-y += htGraph4Degenerate.c
+libagesa-y += htGraph4FullyConnected.c
+libagesa-y += htGraph4Kite.c
+libagesa-y += htGraph4Line.c
+libagesa-y += htGraph4Square.c
+libagesa-y += htGraph4Star.c
+libagesa-y += htGraph5FullyConnected.c
+libagesa-y += htGraph5TwistedLadder.c
+libagesa-y += htGraph6DoubloonLower.c
+libagesa-y += htGraph6DoubloonUpper.c
+libagesa-y += htGraph6FullyConnected.c
+libagesa-y += htGraph6TwinTriangles.c
+libagesa-y += htGraph6TwistedLadder.c
+libagesa-y += htGraph7FullyConnected.c
+libagesa-y += htGraph7TwistedLadder.c
+libagesa-y += htGraph8DoubloonM.c
+libagesa-y += htGraph8FullyConnected.c
+libagesa-y += htGraph8Ladder.c
+libagesa-y += htGraph8TwinFullyFourWays.c
+libagesa-y += htGraph8TwistedLadder.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/C32/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/C32/Makefile.inc
new file mode 100644
index 0000000..1149973
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/C32/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += marc32_3.c
+libagesa-y += mauc32_3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/HY/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/HY/Makefile.inc
new file mode 100644
index 0000000..a9f4861
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/HY/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += marhy3.c
+libagesa-y += mauhy3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/Makefile.inc
new file mode 100644
index 0000000..3b5087c
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += ma.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/OR/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/OR/Makefile.inc
new file mode 100644
index 0000000..6e046d1
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ardk/OR/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += maror3.c
+libagesa-y += mauor3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/CHINTLV/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/CHINTLV/Makefile.inc
new file mode 100644
index 0000000..6599c47
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/CHINTLV/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfchi.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/CSINTLV/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/CSINTLV/Makefile.inc
new file mode 100644
index 0000000..c7dc75b
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/CSINTLV/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfcsi.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/DMI/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/DMI/Makefile.inc
new file mode 100644
index 0000000..c5c1eac
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/DMI/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfDMI.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/ECC/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/ECC/Makefile.inc
new file mode 100644
index 0000000..25c0f38
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/ECC/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += mfecc.c
+libagesa-y += mfemp.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/EXCLUDIMM/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/EXCLUDIMM/Makefile.inc
new file mode 100644
index 0000000..31cf348
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/EXCLUDIMM/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfdimmexclud.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/IDENDIMM/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/IDENDIMM/Makefile.inc
new file mode 100644
index 0000000..8f98ec3
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/IDENDIMM/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfidendimm.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/INTLVRN/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/INTLVRN/Makefile.inc
new file mode 100644
index 0000000..d9fca46
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/INTLVRN/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfintlvrn.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/LVDDR3/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/LVDDR3/Makefile.inc
new file mode 100644
index 0000000..436ceb3
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/LVDDR3/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mflvddr3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/MEMCLR/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/MEMCLR/Makefile.inc
new file mode 100644
index 0000000..94d80c7
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/MEMCLR/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfmemclr.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/NDINTLV/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/NDINTLV/Makefile.inc
new file mode 100644
index 0000000..66e1772
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/NDINTLV/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfndi.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/ODTHERMAL/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/ODTHERMAL/Makefile.inc
new file mode 100644
index 0000000..e1b5923
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/ODTHERMAL/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfodthermal.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/OLSPARE/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/OLSPARE/Makefile.inc
new file mode 100644
index 0000000..06def96
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/OLSPARE/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfspr.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/PARTRN/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/PARTRN/Makefile.inc
new file mode 100644
index 0000000..90c8566
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/PARTRN/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += mfParallelTraining.c
+libagesa-y += mfStandardTraining.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/S3/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/S3/Makefile.inc
new file mode 100644
index 0000000..506cda0
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/S3/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfs3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/TABLE/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/TABLE/Makefile.inc
new file mode 100644
index 0000000..27dcfe7
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Feat/TABLE/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mftds.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/C32/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/C32/Makefile.inc
new file mode 100644
index 0000000..66045b1
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/C32/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mmflowC32.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/HY/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/HY/Makefile.inc
new file mode 100644
index 0000000..52307e2
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/HY/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += mmflowhy.c
+libagesa-y += mmflowhy.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/Makefile.inc
new file mode 100644
index 0000000..4c61d95
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/Makefile.inc
@@ -0,0 +1,18 @@
+libagesa-y += mdef.c
+libagesa-y += merrhdl.c
+libagesa-y += minit.c
+libagesa-y += mm.c
+libagesa-y += mmConditionalPso.c
+libagesa-y += mmEcc.c
+libagesa-y += mmExcludeDimm.c
+libagesa-y += mmLvDdr3.c
+libagesa-y += mmMemClr.c
+libagesa-y += mmMemRestore.c
+libagesa-y += mmNodeInterleave.c
+libagesa-y += mmOnlineSpare.c
+libagesa-y += mmParallelTraining.c
+libagesa-y += mmStandardTraining.c
+libagesa-y += mmUmaAlloc.c
+libagesa-y += mmflow.c
+libagesa-y += mu.c
+libagesa-y += muc.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/OR/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/OR/Makefile.inc
new file mode 100644
index 0000000..7a0b6db
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/OR/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mmflowor.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/C32/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/C32/Makefile.inc
new file mode 100644
index 0000000..4a99c81
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/C32/Makefile.inc
@@ -0,0 +1,11 @@
+libagesa-y += mnParTrainc32.c
+libagesa-y += mnS3c32.c
+libagesa-y += mnc32.c
+libagesa-y += mndctc32.c
+libagesa-y += mnflowc32.c
+libagesa-y += mnidendimmc32.c
+libagesa-y += mnmctc32.c
+libagesa-y += mnotc32.c
+libagesa-y += mnphyc32.c
+libagesa-y += mnprotoc32.c
+libagesa-y += mnregc32.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/HY/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/HY/Makefile.inc
new file mode 100644
index 0000000..1114ad4
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/HY/Makefile.inc
@@ -0,0 +1,11 @@
+libagesa-y += mnParTrainHy.c
+libagesa-y += mnS3hy.c
+libagesa-y += mndcthy.c
+libagesa-y += mnflowhy.c
+libagesa-y += mnhy.c
+libagesa-y += mnidendimmhy.c
+libagesa-y += mnmcthy.c
+libagesa-y += mnothy.c
+libagesa-y += mnphyhy.c
+libagesa-y += mnprotohy.c
+libagesa-y += mnreghy.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/Makefile.inc
new file mode 100644
index 0000000..eb029c2
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/Makefile.inc
@@ -0,0 +1,9 @@
+libagesa-y += mn.c
+libagesa-y += mnS3.c
+libagesa-y += mndct.c
+libagesa-y += mnfeat.c
+libagesa-y += mnflow.c
+libagesa-y += mnmct.c
+libagesa-y += mnphy.c
+libagesa-y += mnreg.c
+libagesa-y += mntrain3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/OR/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/OR/Makefile.inc
new file mode 100644
index 0000000..8a8963e
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/OR/Makefile.inc
@@ -0,0 +1,11 @@
+libagesa-y += mndctor.c
+libagesa-y += mnflowor.c
+libagesa-y += mnidendimmor.c
+libagesa-y += mnmctor.c
+libagesa-y += mnor.c
+libagesa-y += mnotor.c
+libagesa-y += mnpartrainor.c
+libagesa-y += mnphyor.c
+libagesa-y += mnprotoor.c
+libagesa-y += mnregor.c
+libagesa-y += mns3or.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/C32/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/C32/Makefile.inc
new file mode 100644
index 0000000..209b77f
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/C32/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += mprc32_3.c
+libagesa-y += mpuc32_3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/HY/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/HY/Makefile.inc
new file mode 100644
index 0000000..fa20290
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/HY/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += mprhy3.c
+libagesa-y += mpshy3.c
+libagesa-y += mpuhy3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/Makefile.inc
new file mode 100644
index 0000000..5eb7129
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/Makefile.inc
@@ -0,0 +1,13 @@
+libagesa-y += mp.c
+libagesa-y += mplribt.c
+libagesa-y += mplrnlr.c
+libagesa-y += mplrnpr.c
+libagesa-y += mpmaxfreq.c
+libagesa-y += mpmr0.c
+libagesa-y += mpodtpat.c
+libagesa-y += mprc10opspd.c
+libagesa-y += mprc2ibt.c
+libagesa-y += mprtt.c
+libagesa-y += mps2d.c
+libagesa-y += mpsao.c
+libagesa-y += mpseeds.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/OR/C32/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/OR/C32/Makefile.inc
new file mode 100644
index 0000000..45e839c
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/OR/C32/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += mpLorC3.c
+libagesa-y += mpRorC3.c
+libagesa-y += mpUorC3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/OR/G34/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/OR/G34/Makefile.inc
new file mode 100644
index 0000000..173efca
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/OR/G34/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += mpLorG3.c
+libagesa-y += mpRorG3.c
+libagesa-y += mpUorG3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/OR/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/OR/Makefile.inc
new file mode 100644
index 0000000..412f9dd
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/OR/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mpor3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Tech/DDR3/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Tech/DDR3/Makefile.inc
new file mode 100644
index 0000000..e2af37d
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Tech/DDR3/Makefile.inc
@@ -0,0 +1,8 @@
+libagesa-y += mt3.c
+libagesa-y += mtlrdimm3.c
+libagesa-y += mtot3.c
+libagesa-y += mtrci3.c
+libagesa-y += mtsdi3.c
+libagesa-y += mtspd3.c
+libagesa-y += mttecc3.c
+libagesa-y += mttwl3.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Tech/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Mem/Tech/Makefile.inc
new file mode 100644
index 0000000..fa6a130
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Tech/Makefile.inc
@@ -0,0 +1,10 @@
+libagesa-y += mt.c
+libagesa-y += mthdi.c
+libagesa-y += mttEdgeDetect.c
+libagesa-y += mttdimbt.c
+libagesa-y += mttecc.c
+libagesa-y += mtthrc.c
+libagesa-y += mtthrcSeedTrain.c
+libagesa-y += mttml.c
+libagesa-y += mttoptsrc.c
+libagesa-y += mttsrc.c
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Recovery/HT/Makefile.inc b/src/vendorcode/amd/agesa/f15/Proc/Recovery/HT/Makefile.inc
new file mode 100644
index 0000000..2620766
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f15/Proc/Recovery/HT/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += htInitRecovery.c
+libagesa-y += htInitReset.c