diff --git a/meta-amd/meta-ethanolx/conf/conf-notes.txt b/meta-amd/meta-ethanolx/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-amd/meta-ethanolx/conf/conf-notes.txt
rename to meta-amd/meta-ethanolx/conf/templates/default/conf-notes.txt
diff --git a/meta-ampere/meta-jade/conf/conf-notes.txt b/meta-ampere/meta-jade/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-ampere/meta-jade/conf/conf-notes.txt
rename to meta-ampere/meta-jade/conf/templates/default/conf-notes.txt
diff --git a/meta-bytedance/meta-g220a/conf/conf-notes.txt b/meta-bytedance/meta-g220a/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-bytedance/meta-g220a/conf/conf-notes.txt
rename to meta-bytedance/meta-g220a/conf/templates/default/conf-notes.txt
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/conf-notes.txt b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/conf-notes.txt
rename to meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/conf-notes.txt
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/conf-notes.txt b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/conf-notes.txt
rename to meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/conf-notes.txt
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/conf-notes.txt b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/conf-notes.txt
rename to meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/conf-notes.txt
diff --git a/meta-evb/meta-evb-raspberrypi/conf/conf-notes.txt b/meta-evb/meta-evb-raspberrypi/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-evb/meta-evb-raspberrypi/conf/conf-notes.txt
rename to meta-evb/meta-evb-raspberrypi/conf/templates/default/conf-notes.txt
diff --git a/meta-facebook/meta-bletchley/conf/conf-notes.txt b/meta-facebook/meta-bletchley/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-facebook/meta-bletchley/conf/conf-notes.txt
rename to meta-facebook/meta-bletchley/conf/templates/default/conf-notes.txt
diff --git a/meta-facebook/meta-greatlakes/conf/conf-notes.txt b/meta-facebook/meta-greatlakes/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-facebook/meta-greatlakes/conf/conf-notes.txt
rename to meta-facebook/meta-greatlakes/conf/templates/default/conf-notes.txt
diff --git a/meta-facebook/meta-tiogapass/conf/conf-notes.txt b/meta-facebook/meta-tiogapass/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-facebook/meta-tiogapass/conf/conf-notes.txt
rename to meta-facebook/meta-tiogapass/conf/templates/default/conf-notes.txt
diff --git a/meta-facebook/meta-yosemitev2/conf/conf-notes.txt b/meta-facebook/meta-yosemitev2/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-facebook/meta-yosemitev2/conf/conf-notes.txt
rename to meta-facebook/meta-yosemitev2/conf/templates/default/conf-notes.txt
diff --git a/meta-fii/meta-kudo/conf/conf-notes.txt b/meta-fii/meta-kudo/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-fii/meta-kudo/conf/conf-notes.txt
rename to meta-fii/meta-kudo/conf/templates/default/conf-notes.txt
diff --git a/meta-fii/meta-mori/conf/conf-notes.txt b/meta-fii/meta-mori/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-fii/meta-mori/conf/conf-notes.txt
rename to meta-fii/meta-mori/conf/templates/default/conf-notes.txt
diff --git a/meta-ibm/conf/conf-notes.txt b/meta-ibm/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-ibm/conf/conf-notes.txt
rename to meta-ibm/conf/templates/default/conf-notes.txt
diff --git a/meta-ibm/meta-palmetto/conf/conf-notes.txt b/meta-ibm/meta-palmetto/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-ibm/meta-palmetto/conf/conf-notes.txt
rename to meta-ibm/meta-palmetto/conf/templates/default/conf-notes.txt
diff --git a/meta-ibm/meta-romulus/conf/conf-notes.txt b/meta-ibm/meta-romulus/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-ibm/meta-romulus/conf/conf-notes.txt
rename to meta-ibm/meta-romulus/conf/templates/default/conf-notes.txt
diff --git a/meta-ingrasys/meta-zaius/conf/conf-notes.txt b/meta-ingrasys/meta-zaius/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-ingrasys/meta-zaius/conf/conf-notes.txt
rename to meta-ingrasys/meta-zaius/conf/templates/default/conf-notes.txt
diff --git a/meta-inspur/meta-fp5280g2/conf/conf-notes.txt b/meta-inspur/meta-fp5280g2/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-inspur/meta-fp5280g2/conf/conf-notes.txt
rename to meta-inspur/meta-fp5280g2/conf/templates/default/conf-notes.txt
diff --git a/meta-inspur/meta-on5263m5/conf/conf-notes.txt b/meta-inspur/meta-on5263m5/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-inspur/meta-on5263m5/conf/conf-notes.txt
rename to meta-inspur/meta-on5263m5/conf/templates/default/conf-notes.txt
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/conf-notes.txt b/meta-intel-openbmc/meta-s2600wf/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-intel-openbmc/meta-s2600wf/conf/conf-notes.txt
rename to meta-intel-openbmc/meta-s2600wf/conf/templates/default/conf-notes.txt
diff --git a/meta-inventec/meta-transformers/conf/conf-notes.txt b/meta-inventec/meta-transformers/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-inventec/meta-transformers/conf/conf-notes.txt
rename to meta-inventec/meta-transformers/conf/templates/default/conf-notes.txt
diff --git a/meta-phosphor/conf/conf-notes.txt b/meta-phosphor/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-phosphor/conf/conf-notes.txt
rename to meta-phosphor/conf/templates/default/conf-notes.txt
diff --git a/meta-qualcomm/conf/conf-notes.txt b/meta-qualcomm/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-qualcomm/conf/conf-notes.txt
rename to meta-qualcomm/conf/templates/default/conf-notes.txt
diff --git a/meta-quanta/meta-f0b/conf/conf-notes.txt b/meta-quanta/meta-f0b/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-quanta/meta-f0b/conf/conf-notes.txt
rename to meta-quanta/meta-f0b/conf/templates/default/conf-notes.txt
diff --git a/meta-quanta/meta-gbs/conf/conf-notes.txt b/meta-quanta/meta-gbs/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-quanta/meta-gbs/conf/conf-notes.txt
rename to meta-quanta/meta-gbs/conf/templates/default/conf-notes.txt
diff --git a/meta-quanta/meta-gsj/conf/conf-notes.txt b/meta-quanta/meta-gsj/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-quanta/meta-gsj/conf/conf-notes.txt
rename to meta-quanta/meta-gsj/conf/templates/default/conf-notes.txt
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/conf-notes.txt b/meta-quanta/meta-olympus-nuvoton/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-quanta/meta-olympus-nuvoton/conf/conf-notes.txt
rename to meta-quanta/meta-olympus-nuvoton/conf/templates/default/conf-notes.txt
diff --git a/meta-quanta/meta-q71l/conf/conf-notes.txt b/meta-quanta/meta-q71l/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-quanta/meta-q71l/conf/conf-notes.txt
rename to meta-quanta/meta-q71l/conf/templates/default/conf-notes.txt
diff --git a/meta-quanta/meta-s6q/conf/conf-notes.txt b/meta-quanta/meta-s6q/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-quanta/meta-s6q/conf/conf-notes.txt
rename to meta-quanta/meta-s6q/conf/templates/default/conf-notes.txt
diff --git a/meta-supermicro/meta-x11spi/conf/conf-notes.txt b/meta-supermicro/meta-x11spi/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-supermicro/meta-x11spi/conf/conf-notes.txt
rename to meta-supermicro/meta-x11spi/conf/templates/default/conf-notes.txt
diff --git a/meta-tyan/meta-s7106/conf/conf-notes.txt b/meta-tyan/meta-s7106/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-tyan/meta-s7106/conf/conf-notes.txt
rename to meta-tyan/meta-s7106/conf/templates/default/conf-notes.txt
diff --git a/meta-tyan/meta-s8036/conf/conf-notes.txt b/meta-tyan/meta-s8036/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-tyan/meta-s8036/conf/conf-notes.txt
rename to meta-tyan/meta-s8036/conf/templates/default/conf-notes.txt
diff --git a/meta-wistron/meta-lannister/conf/conf-notes.txt b/meta-wistron/meta-lannister/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-wistron/meta-lannister/conf/conf-notes.txt
rename to meta-wistron/meta-lannister/conf/templates/default/conf-notes.txt
diff --git a/meta-yadro/meta-nicole/conf/conf-notes.txt b/meta-yadro/meta-nicole/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-yadro/meta-nicole/conf/conf-notes.txt
rename to meta-yadro/meta-nicole/conf/templates/default/conf-notes.txt
diff --git a/meta-yadro/meta-vegman/conf/conf-notes.txt b/meta-yadro/meta-vegman/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-yadro/meta-vegman/conf/conf-notes.txt
rename to meta-yadro/meta-vegman/conf/templates/default/conf-notes.txt