diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf
index a12e3f4..a24ac97 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf
@@ -1,5 +1,10 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_PATTERN_ast2400 = "^${LAYERDIR}/"
 BBFILE_COLLECTIONS += "ast2400"
-BBFILE_PATTERN_ast2400 = ""
+LAYERVERSION_ast2400 = "1"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-bsp/u-boot/files/config.patch b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-bsp/u-boot/files/config.patch
rename to meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-bsp/u-boot/files/fw_env.config b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-bsp/u-boot/files/fw_env.config
rename to meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-bsp/u-boot/files/patch-2013.07/0000-u-boot-aspeed-064.patch b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0000-u-boot-aspeed-064.patch
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-bsp/u-boot/files/patch-2013.07/0000-u-boot-aspeed-064.patch
rename to meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0000-u-boot-aspeed-064.patch
Binary files differ
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-bsp/u-boot/files/patch-2013.07/0001-u-boot-openbmc.patch b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0001-u-boot-openbmc.patch
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-bsp/u-boot/files/patch-2013.07/0001-u-boot-openbmc.patch
rename to meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0001-u-boot-openbmc.patch
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-bsp/u-boot/u-boot_2013.07%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
rename to meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc_%.bbappend
rename to meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes.txt b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes.txt
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes.txt
rename to meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes.txt
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/layer.conf
deleted file mode 100644
index a0f16b4..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/layer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILE_COLLECTIONS += "foxconn"
-BBFILE_PATTERN_foxconn = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/machine/barreleye.conf b/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/machine/barreleye.conf
deleted file mode 100644
index f3da811..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/machine/barreleye.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
-
-require conf/machine/include/ast2400.inc
-require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/foxconn.inc
-
-UBOOT_MACHINE_barreleye = "barreleye_config"
-UBOOT_ENTRYPOINT = "0x40008000"
-UBOOT_LOADADDRESS = "0x40008000"
-
-FLASH_SIZE = "32768"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/layer.conf
index b34e780..ac8a2a2 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/layer.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/layer.conf
@@ -1,9 +1,5 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 
-# We have a recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
-
 BBFILE_COLLECTIONS += "palmetto"
 BBFILE_PATTERN_palmetto = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/layer.conf
new file mode 100644
index 0000000..9bc3e93
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/layer.conf
@@ -0,0 +1,5 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+BBFILE_COLLECTIONS += "rackspace"
+BBFILE_PATTERN_rackspace = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/machine/include/foxconn.inc b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/machine/include/rackspace.inc
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-foxconn/conf/machine/include/foxconn.inc
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/conf/machine/include/rackspace.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
similarity index 70%
rename from meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/bblayers.conf.sample
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
index f30ab15..a261b26 100644
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
@@ -12,8 +12,8 @@
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-foxconn \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
@@ -22,6 +22,6 @@
   ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-aspeed/meta-ast2400 \
   ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-openpower/meta-foxconn \
-  ##OEROOT##/meta-openpower/meta-foxconn/meta-barreleye \
+  ##OEROOT##/meta-openpower/meta-rackspace \
+  ##OEROOT##/meta-openpower/meta-rackspace/meta-barreleye \
   "
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/conf-notes.txt b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/conf-notes.txt
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/conf-notes.txt
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/conf-notes.txt
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/layer.conf
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/layer.conf
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/layer.conf
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/local.conf.sample
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
new file mode 100644
index 0000000..6c8f0bf
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
@@ -0,0 +1,12 @@
+KMACHINE = "aspeed"
+KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-palmetto.dtb"
+
+require conf/machine/include/ast2400.inc
+require conf/machine/include/obmc-bsp-common.inc
+require conf/machine/include/rackspace.inc
+
+UBOOT_MACHINE_barreleye = "palmetto_config"
+UBOOT_ENTRYPOINT = "0x40008000"
+UBOOT_LOADADDRESS = "0x40008000"
+
+FLASH_SIZE = "32768"