diff --git a/meta-amd/meta-ethanolx/conf/bblayers.conf.sample b/meta-amd/meta-ethanolx/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-amd/meta-ethanolx/conf/bblayers.conf.sample
rename to meta-amd/meta-ethanolx/conf/templates/default/bblayers.conf.sample
diff --git a/meta-amd/meta-ethanolx/conf/local.conf.sample b/meta-amd/meta-ethanolx/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-amd/meta-ethanolx/conf/local.conf.sample
rename to meta-amd/meta-ethanolx/conf/templates/default/local.conf.sample
diff --git a/meta-ampere/meta-jade/conf/bblayers.conf.sample b/meta-ampere/meta-jade/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-ampere/meta-jade/conf/bblayers.conf.sample
rename to meta-ampere/meta-jade/conf/templates/default/bblayers.conf.sample
diff --git a/meta-ampere/meta-jade/conf/local.conf.sample b/meta-ampere/meta-jade/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-ampere/meta-jade/conf/local.conf.sample
rename to meta-ampere/meta-jade/conf/templates/default/local.conf.sample
diff --git a/meta-aspeed/conf/bblayers.conf.sample b/meta-aspeed/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-aspeed/conf/bblayers.conf.sample
rename to meta-aspeed/conf/templates/default/bblayers.conf.sample
diff --git a/meta-aspeed/conf/local.conf.sample b/meta-aspeed/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-aspeed/conf/local.conf.sample
rename to meta-aspeed/conf/templates/default/local.conf.sample
diff --git a/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample b/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample
rename to meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
diff --git a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample b/meta-asrock/meta-e3c246d4i/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-asrock/meta-e3c246d4i/conf/local.conf.sample
rename to meta-asrock/meta-e3c246d4i/conf/templates/default/local.conf.sample
diff --git a/meta-asrock/meta-romed8hm3/conf/bblayers.conf.sample b/meta-asrock/meta-romed8hm3/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-asrock/meta-romed8hm3/conf/bblayers.conf.sample
rename to meta-asrock/meta-romed8hm3/conf/templates/default/bblayers.conf.sample
diff --git a/meta-asrock/meta-romed8hm3/conf/local.conf.sample b/meta-asrock/meta-romed8hm3/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-asrock/meta-romed8hm3/conf/local.conf.sample
rename to meta-asrock/meta-romed8hm3/conf/templates/default/local.conf.sample
diff --git a/meta-bytedance/meta-g220a/conf/bblayers.conf.sample b/meta-bytedance/meta-g220a/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-bytedance/meta-g220a/conf/bblayers.conf.sample
rename to meta-bytedance/meta-g220a/conf/templates/default/bblayers.conf.sample
diff --git a/meta-bytedance/meta-g220a/conf/local.conf.sample b/meta-bytedance/meta-g220a/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-bytedance/meta-g220a/conf/local.conf.sample
rename to meta-bytedance/meta-g220a/conf/templates/default/local.conf.sample
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
rename to meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/bblayers.conf.sample
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample
rename to meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/local.conf.sample
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample
rename to meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/bblayers.conf.sample
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample
rename to meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/local.conf.sample
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
rename to meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/bblayers.conf.sample
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample
rename to meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/local.conf.sample
diff --git a/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample
rename to meta-evb/meta-evb-raspberrypi/conf/templates/default/bblayers.conf.sample
diff --git a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-evb/meta-evb-raspberrypi/conf/local.conf.sample
rename to meta-evb/meta-evb-raspberrypi/conf/templates/default/local.conf.sample
diff --git a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample b/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-facebook/meta-bletchley/conf/bblayers.conf.sample
rename to meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
diff --git a/meta-facebook/meta-bletchley/conf/local.conf.sample b/meta-facebook/meta-bletchley/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-facebook/meta-bletchley/conf/local.conf.sample
rename to meta-facebook/meta-bletchley/conf/templates/default/local.conf.sample
diff --git a/meta-facebook/meta-greatlakes/conf/bblayers.conf.sample b/meta-facebook/meta-greatlakes/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-facebook/meta-greatlakes/conf/bblayers.conf.sample
rename to meta-facebook/meta-greatlakes/conf/templates/default/bblayers.conf.sample
diff --git a/meta-facebook/meta-greatlakes/conf/local.conf.sample b/meta-facebook/meta-greatlakes/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-facebook/meta-greatlakes/conf/local.conf.sample
rename to meta-facebook/meta-greatlakes/conf/templates/default/local.conf.sample
diff --git a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample b/meta-facebook/meta-tiogapass/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-facebook/meta-tiogapass/conf/bblayers.conf.sample
rename to meta-facebook/meta-tiogapass/conf/templates/default/bblayers.conf.sample
diff --git a/meta-facebook/meta-tiogapass/conf/local.conf.sample b/meta-facebook/meta-tiogapass/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-facebook/meta-tiogapass/conf/local.conf.sample
rename to meta-facebook/meta-tiogapass/conf/templates/default/local.conf.sample
diff --git a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample b/meta-facebook/meta-yosemitev2/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample
rename to meta-facebook/meta-yosemitev2/conf/templates/default/bblayers.conf.sample
diff --git a/meta-facebook/meta-yosemitev2/conf/local.conf.sample b/meta-facebook/meta-yosemitev2/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-facebook/meta-yosemitev2/conf/local.conf.sample
rename to meta-facebook/meta-yosemitev2/conf/templates/default/local.conf.sample
diff --git a/meta-fii/meta-kudo/conf/bblayers.conf.sample b/meta-fii/meta-kudo/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-fii/meta-kudo/conf/bblayers.conf.sample
rename to meta-fii/meta-kudo/conf/templates/default/bblayers.conf.sample
diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-fii/meta-kudo/conf/local.conf.sample
rename to meta-fii/meta-kudo/conf/templates/default/local.conf.sample
diff --git a/meta-fii/meta-mori/conf/bblayers.conf.sample b/meta-fii/meta-mori/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-fii/meta-mori/conf/bblayers.conf.sample
rename to meta-fii/meta-mori/conf/templates/default/bblayers.conf.sample
diff --git a/meta-fii/meta-mori/conf/local.conf.sample b/meta-fii/meta-mori/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-fii/meta-mori/conf/local.conf.sample
rename to meta-fii/meta-mori/conf/templates/default/local.conf.sample
diff --git a/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample b/meta-hpe/meta-dl360poc/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-hpe/meta-dl360poc/conf/bblayers.conf.sample
rename to meta-hpe/meta-dl360poc/conf/templates/default/bblayers.conf.sample
diff --git a/meta-hpe/meta-dl360poc/conf/local.conf.sample b/meta-hpe/meta-dl360poc/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-hpe/meta-dl360poc/conf/local.conf.sample
rename to meta-hpe/meta-dl360poc/conf/templates/default/local.conf.sample
diff --git a/meta-ibm/conf/bblayers.conf.sample b/meta-ibm/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-ibm/conf/bblayers.conf.sample
rename to meta-ibm/conf/templates/default/bblayers.conf.sample
diff --git a/meta-ibm/conf/local.conf.sample b/meta-ibm/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-ibm/conf/local.conf.sample
rename to meta-ibm/conf/templates/default/local.conf.sample
diff --git a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-ibm/meta-palmetto/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-ibm/meta-palmetto/conf/bblayers.conf.sample
rename to meta-ibm/meta-palmetto/conf/templates/default/bblayers.conf.sample
diff --git a/meta-ibm/meta-palmetto/conf/local.conf.sample b/meta-ibm/meta-palmetto/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-ibm/meta-palmetto/conf/local.conf.sample
rename to meta-ibm/meta-palmetto/conf/templates/default/local.conf.sample
diff --git a/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-ibm/meta-romulus/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-ibm/meta-romulus/conf/bblayers.conf.sample
rename to meta-ibm/meta-romulus/conf/templates/default/bblayers.conf.sample
diff --git a/meta-ibm/meta-romulus/conf/local.conf.sample b/meta-ibm/meta-romulus/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-ibm/meta-romulus/conf/local.conf.sample
rename to meta-ibm/meta-romulus/conf/templates/default/local.conf.sample
diff --git a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-ingrasys/meta-zaius/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
rename to meta-ingrasys/meta-zaius/conf/templates/default/bblayers.conf.sample
diff --git a/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-ingrasys/meta-zaius/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-ingrasys/meta-zaius/conf/local.conf.sample
rename to meta-ingrasys/meta-zaius/conf/templates/default/local.conf.sample
diff --git a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample b/meta-inspur/meta-fp5280g2/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample
rename to meta-inspur/meta-fp5280g2/conf/templates/default/bblayers.conf.sample
diff --git a/meta-inspur/meta-fp5280g2/conf/local.conf.sample b/meta-inspur/meta-fp5280g2/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-inspur/meta-fp5280g2/conf/local.conf.sample
rename to meta-inspur/meta-fp5280g2/conf/templates/default/local.conf.sample
diff --git a/meta-inspur/meta-on5263m5/conf/bblayers.conf.sample b/meta-inspur/meta-on5263m5/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-inspur/meta-on5263m5/conf/bblayers.conf.sample
rename to meta-inspur/meta-on5263m5/conf/templates/default/bblayers.conf.sample
diff --git a/meta-inspur/meta-on5263m5/conf/local.conf.sample b/meta-inspur/meta-on5263m5/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-inspur/meta-on5263m5/conf/local.conf.sample
rename to meta-inspur/meta-on5263m5/conf/templates/default/local.conf.sample
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample
rename to meta-intel-openbmc/meta-s2600wf/conf/templates/default/bblayers.conf.sample
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample
rename to meta-intel-openbmc/meta-s2600wf/conf/templates/default/local.conf.sample
diff --git a/meta-inventec/meta-transformers/conf/bblayers.conf.sample b/meta-inventec/meta-transformers/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-inventec/meta-transformers/conf/bblayers.conf.sample
rename to meta-inventec/meta-transformers/conf/templates/default/bblayers.conf.sample
diff --git a/meta-inventec/meta-transformers/conf/local.conf.sample b/meta-inventec/meta-transformers/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-inventec/meta-transformers/conf/local.conf.sample
rename to meta-inventec/meta-transformers/conf/templates/default/local.conf.sample
diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-phosphor/conf/bblayers.conf.sample
rename to meta-phosphor/conf/templates/default/bblayers.conf.sample
diff --git a/meta-phosphor/conf/local.conf.sample b/meta-phosphor/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-phosphor/conf/local.conf.sample
rename to meta-phosphor/conf/templates/default/local.conf.sample
diff --git a/meta-qualcomm/conf/bblayers.conf.sample b/meta-qualcomm/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-qualcomm/conf/bblayers.conf.sample
rename to meta-qualcomm/conf/templates/default/bblayers.conf.sample
diff --git a/meta-qualcomm/conf/local.conf.sample b/meta-qualcomm/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-qualcomm/conf/local.conf.sample
rename to meta-qualcomm/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-f0b/conf/bblayers.conf.sample b/meta-quanta/meta-f0b/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-quanta/meta-f0b/conf/bblayers.conf.sample
rename to meta-quanta/meta-f0b/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-f0b/conf/local.conf.sample b/meta-quanta/meta-f0b/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-quanta/meta-f0b/conf/local.conf.sample
rename to meta-quanta/meta-f0b/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-gbs/conf/bblayers.conf.sample b/meta-quanta/meta-gbs/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-quanta/meta-gbs/conf/bblayers.conf.sample
rename to meta-quanta/meta-gbs/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-gbs/conf/local.conf.sample b/meta-quanta/meta-gbs/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-quanta/meta-gbs/conf/local.conf.sample
rename to meta-quanta/meta-gbs/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-gsj/conf/bblayers.conf.sample b/meta-quanta/meta-gsj/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-quanta/meta-gsj/conf/bblayers.conf.sample
rename to meta-quanta/meta-gsj/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-gsj/conf/local.conf.sample b/meta-quanta/meta-gsj/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-quanta/meta-gsj/conf/local.conf.sample
rename to meta-quanta/meta-gsj/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample
rename to meta-quanta/meta-olympus-nuvoton/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample
rename to meta-quanta/meta-olympus-nuvoton/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-quanta/meta-q71l/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-quanta/meta-q71l/conf/bblayers.conf.sample
rename to meta-quanta/meta-q71l/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-q71l/conf/local.conf.sample b/meta-quanta/meta-q71l/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-quanta/meta-q71l/conf/local.conf.sample
rename to meta-quanta/meta-q71l/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-s6q/conf/bblayers.conf.sample b/meta-quanta/meta-s6q/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-quanta/meta-s6q/conf/bblayers.conf.sample
rename to meta-quanta/meta-s6q/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-s6q/conf/local.conf.sample b/meta-quanta/meta-s6q/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-quanta/meta-s6q/conf/local.conf.sample
rename to meta-quanta/meta-s6q/conf/templates/default/local.conf.sample
diff --git a/meta-supermicro/meta-x11spi/conf/bblayers.conf.sample b/meta-supermicro/meta-x11spi/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-supermicro/meta-x11spi/conf/bblayers.conf.sample
rename to meta-supermicro/meta-x11spi/conf/templates/default/bblayers.conf.sample
diff --git a/meta-supermicro/meta-x11spi/conf/local.conf.sample b/meta-supermicro/meta-x11spi/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-supermicro/meta-x11spi/conf/local.conf.sample
rename to meta-supermicro/meta-x11spi/conf/templates/default/local.conf.sample
diff --git a/meta-tyan/meta-s7106/conf/bblayers.conf.sample b/meta-tyan/meta-s7106/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-tyan/meta-s7106/conf/bblayers.conf.sample
rename to meta-tyan/meta-s7106/conf/templates/default/bblayers.conf.sample
diff --git a/meta-tyan/meta-s7106/conf/local.conf.sample b/meta-tyan/meta-s7106/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-tyan/meta-s7106/conf/local.conf.sample
rename to meta-tyan/meta-s7106/conf/templates/default/local.conf.sample
diff --git a/meta-tyan/meta-s8036/conf/bblayers.conf.sample b/meta-tyan/meta-s8036/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-tyan/meta-s8036/conf/bblayers.conf.sample
rename to meta-tyan/meta-s8036/conf/templates/default/bblayers.conf.sample
diff --git a/meta-tyan/meta-s8036/conf/local.conf.sample b/meta-tyan/meta-s8036/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-tyan/meta-s8036/conf/local.conf.sample
rename to meta-tyan/meta-s8036/conf/templates/default/local.conf.sample
diff --git a/meta-wistron/meta-lannister/conf/bblayers.conf.sample b/meta-wistron/meta-lannister/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-wistron/meta-lannister/conf/bblayers.conf.sample
rename to meta-wistron/meta-lannister/conf/templates/default/bblayers.conf.sample
diff --git a/meta-wistron/meta-lannister/conf/local.conf.sample b/meta-wistron/meta-lannister/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-wistron/meta-lannister/conf/local.conf.sample
rename to meta-wistron/meta-lannister/conf/templates/default/local.conf.sample
diff --git a/meta-yadro/meta-nicole/conf/bblayers.conf.sample b/meta-yadro/meta-nicole/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-yadro/meta-nicole/conf/bblayers.conf.sample
rename to meta-yadro/meta-nicole/conf/templates/default/bblayers.conf.sample
diff --git a/meta-yadro/meta-nicole/conf/local.conf.sample b/meta-yadro/meta-nicole/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-yadro/meta-nicole/conf/local.conf.sample
rename to meta-yadro/meta-nicole/conf/templates/default/local.conf.sample
diff --git a/meta-yadro/meta-vegman/conf/bblayers.conf.sample b/meta-yadro/meta-vegman/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-yadro/meta-vegman/conf/bblayers.conf.sample
rename to meta-yadro/meta-vegman/conf/templates/default/bblayers.conf.sample
diff --git a/meta-yadro/meta-vegman/conf/local.conf.sample b/meta-yadro/meta-vegman/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-yadro/meta-vegman/conf/local.conf.sample
rename to meta-yadro/meta-vegman/conf/templates/default/local.conf.sample
diff --git a/setup b/setup
index 08ac4f4..5152c59 100755
--- a/setup
+++ b/setup
@@ -62,10 +62,10 @@
             tmpl="meta-phosphor/conf"
         else
             # Skip any machines that don't support meta-phosphor.
-            if [ ! -e "$tmpl/bblayers.conf.sample" ]; then
+            if [ ! -e "$tmpl/templates/default/bblayers.conf.sample" ]; then
                 continue
             fi
-            if ! grep -q "##OEROOT##/meta-phosphor" "$tmpl/bblayers.conf.sample"; then
+            if ! grep -q "##OEROOT##/meta-phosphor" "$tmpl/templates/default/bblayers.conf.sample"; then
                 continue
             fi
         fi
@@ -76,7 +76,7 @@
             if [ "${name}" = "${target}" ]; then
                 echo "Machine ${target} found in ${tmpl%/conf}"
                 mkdir -p "${build_dir}"
-                TEMPLATECONF="${tmpl}" source \
+                TEMPLATECONF="${tmpl}/templates/default" source \
                         oe-init-build-env "${build_dir}"
 
                 if [ "$(cat conf/templateconf.cfg)" = "${tmpl}" ]; then