diff --git a/meta-openbmc-bsp/meta-aspeed/COPYING.MIT b/meta-aspeed/COPYING.MIT
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/COPYING.MIT
rename to meta-aspeed/COPYING.MIT
diff --git a/meta-openbmc-bsp/meta-aspeed/COPYING.apache-2.0 b/meta-aspeed/COPYING.apache-2.0
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/COPYING.apache-2.0
rename to meta-aspeed/COPYING.apache-2.0
diff --git a/meta-openbmc-bsp/meta-aspeed/LICENSE b/meta-aspeed/LICENSE
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/LICENSE
rename to meta-aspeed/LICENSE
diff --git a/meta-openbmc-bsp/meta-aspeed/MAINTAINERS b/meta-aspeed/MAINTAINERS
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/MAINTAINERS
rename to meta-aspeed/MAINTAINERS
diff --git a/meta-openbmc-bsp/meta-aspeed/README.md b/meta-aspeed/README.md
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/README.md
rename to meta-aspeed/README.md
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/conf/layer.conf
rename to meta-aspeed/conf/layer.conf
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc
rename to meta-aspeed/conf/machine/include/aspeed.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2400.inc
rename to meta-aspeed/conf/machine/include/ast2400.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2500.inc b/meta-aspeed/conf/machine/include/ast2500.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2500.inc
rename to meta-aspeed/conf/machine/include/ast2500.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc b/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
rename to meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config b/meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config
rename to meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch b/meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch
rename to meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/fw_env.config b/meta-aspeed/recipes-bsp/u-boot/files/fw_env.config
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/fw_env.config
rename to meta-aspeed/recipes-bsp/u-boot/files/fw_env.config
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
rename to meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
rename to meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
rename to meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb
rename to meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules
rename to meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb
rename to meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules
rename to meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig b/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
rename to meta-aspeed/recipes-kernel/linux/ast2400/defconfig
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig b/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
rename to meta-aspeed/recipes-kernel/linux/ast2500/defconfig
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
rename to meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
rename to meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.MIT b/meta-ibm/meta-fsp2/COPYING.MIT
similarity index 100%
rename from meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.MIT
rename to meta-ibm/meta-fsp2/COPYING.MIT
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.apache-2.0 b/meta-ibm/meta-fsp2/COPYING.apache-2.0
similarity index 100%
rename from meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.apache-2.0
rename to meta-ibm/meta-fsp2/COPYING.apache-2.0
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/LICENSE b/meta-ibm/meta-fsp2/LICENSE
similarity index 100%
rename from meta-openbmc-bsp/meta-ibm/meta-fsp2/LICENSE
rename to meta-ibm/meta-fsp2/LICENSE
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/layer.conf b/meta-ibm/meta-fsp2/conf/layer.conf
similarity index 100%
rename from meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/layer.conf
rename to meta-ibm/meta-fsp2/conf/layer.conf
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/include/fsp2.inc b/meta-ibm/meta-fsp2/conf/machine/include/fsp2.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/include/fsp2.inc
rename to meta-ibm/meta-fsp2/conf/machine/include/fsp2.inc
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/sunray2.conf b/meta-ibm/meta-fsp2/conf/machine/sunray2.conf
similarity index 100%
rename from meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/sunray2.conf
rename to meta-ibm/meta-fsp2/conf/machine/sunray2.conf
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc
rename to meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2_4.13.bb b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2_4.13.bb
similarity index 100%
rename from meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2_4.13.bb
rename to meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2_4.13.bb
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes.txt b/meta-ibm/meta-fsp2/recipes.txt
similarity index 100%
rename from meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes.txt
rename to meta-ibm/meta-fsp2/recipes.txt
diff --git a/meta-openbmc-bsp/meta-nuvoton/COPYING.MIT b/meta-nuvoton/COPYING.MIT
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/COPYING.MIT
rename to meta-nuvoton/COPYING.MIT
diff --git a/meta-openbmc-bsp/meta-nuvoton/LICENSE b/meta-nuvoton/LICENSE
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/LICENSE
rename to meta-nuvoton/LICENSE
diff --git a/meta-openbmc-bsp/meta-nuvoton/README.md b/meta-nuvoton/README.md
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/README.md
rename to meta-nuvoton/README.md
diff --git a/meta-openbmc-bsp/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/conf/layer.conf
rename to meta-nuvoton/conf/layer.conf
diff --git a/meta-openbmc-bsp/meta-nuvoton/conf/machine/evb-npcm750.conf b/meta-nuvoton/conf/machine/evb-npcm750.conf
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/conf/machine/evb-npcm750.conf
rename to meta-nuvoton/conf/machine/evb-npcm750.conf
diff --git a/meta-openbmc-bsp/meta-nuvoton/conf/machine/include/npcm7xx.inc b/meta-nuvoton/conf/machine/include/npcm7xx.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/conf/machine/include/npcm7xx.inc
rename to meta-nuvoton/conf/machine/include/npcm7xx.inc
diff --git a/meta-openbmc-bsp/meta-nuvoton/conf/machine/include/nuvoton.inc b/meta-nuvoton/conf/machine/include/nuvoton.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/conf/machine/include/nuvoton.inc
rename to meta-nuvoton/conf/machine/include/nuvoton.inc
diff --git a/meta-openbmc-bsp/meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc b/meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc
rename to meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb
rename to meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
rename to meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc
rename to meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig
rename to meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb
rename to meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes.txt b/meta-nuvoton/recipes.txt
similarity index 100%
rename from meta-openbmc-bsp/meta-nuvoton/recipes.txt
rename to meta-nuvoton/recipes.txt
diff --git a/meta-openbmc-bsp/README.md b/meta-openbmc-bsp/README.md
deleted file mode 100644
index 804db3c..0000000
--- a/meta-openbmc-bsp/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-OpenBMC Board Support Package (BSP)
-================
-
-This is the OpenBMC Board Support Package (BSP) layer.
-A Board Support Package (BSP) is a collection of information that defines how
-to support a particular hardware device, set of devices, or hardware platform.
-The OpenBMC BSP layer includes the service management SOCs, such as ASPEED's
-AST2500 and Nuvoton's NPCM7XX.
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample
index 50aab07..c561f76 100644
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-arm \
   ##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm \
   ##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep \
@@ -28,7 +28,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-arm \
   ##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm \
   ##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep \
diff --git a/meta-openbmc-machines/meta-evb/README.md b/meta-openbmc-machines/meta-evb/README.md
index 757f3c2..6f9a179 100644
--- a/meta-openbmc-machines/meta-evb/README.md
+++ b/meta-openbmc-machines/meta-evb/README.md
@@ -3,7 +3,7 @@
 
 This is the OpenBMC Evaluation Board (EVB) layer. The boards in the EVB layer
 are for evaluation and reference. The [Board Support Package (BSP)
-layer](https://github.com/openbmc/openbmc/tree/master/meta-openbmc-bsp)
+layer](https://github.com/openbmc/openbmc/tree/master/)
 should be used to support a hardware device in a system. Therefore, there
 should not be any EVB layers in a system's bblayers.conf, the BSP layer should
 be used instead. Boards might be found be in both the EVB layer and the BSP
diff --git a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
index 4b3e798..fad77af 100644
--- a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
@@ -13,7 +13,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \
@@ -26,7 +26,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \
diff --git a/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
index fefa416..99dd4d7 100644
--- a/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
@@ -12,7 +12,7 @@
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \
+  ##OEROOT##/meta-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \
@@ -24,7 +24,7 @@
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \
+  ##OEROOT##/meta-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
index 48f8174..e7b9f3d 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto \
@@ -28,7 +28,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
index 83eed8b..52ee80d 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus \
@@ -28,7 +28,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
index ab22ee1..414cb61 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
@@ -28,7 +28,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample
index cb42c63..43eef92 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@
   ##OEROOT##/meta-openembedded/meta-python/   \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-ibm/meta-fsp2 \
+  ##OEROOT##/meta-ibm/meta-fsp2 \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
index e153a4b..80b95b5 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius \
@@ -28,7 +28,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius \
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
index 5884868..296acc3 100644
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
@@ -13,7 +13,7 @@
   ##OEROOT##/meta-openembedded/meta-perl \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \
@@ -26,7 +26,7 @@
   ##OEROOT##/meta-openembedded/meta-perl \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
index 2a4140f..6bd2bf6 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \
@@ -28,7 +28,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \
diff --git a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
index 3c231c7..5f4301b 100644
--- a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-intel \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf \
diff --git a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
index 7bc1aa2..95b3b58 100644
--- a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn \
@@ -28,7 +28,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn \
diff --git a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
index 9726491..90488aa 100644
--- a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
@@ -14,6 +14,6 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune \
   "
diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
index 874a472..4fc6799 100644
--- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l \
@@ -28,7 +28,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l \