Fix invalid layer paths in non-removable

A number of the layer paths in the non-removable section
of the bblayers.conf templates had invalid paths.

Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-witherspoon/conf/bblayers.conf.sample b/meta-witherspoon/conf/bblayers.conf.sample
index 333c7ef..59942f1 100644
--- a/meta-witherspoon/conf/bblayers.conf.sample
+++ b/meta-witherspoon/conf/bblayers.conf.sample
@@ -19,9 +19,9 @@
   ##OEROOT##/meta \
   ##OEROOT##/meta-yocto \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-aspeed/meta-ast2500 \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openpower/meta-ibm/meta-witherspoon\
+  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
   "