diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf
index 38f0a0d..42b1b85 100644
--- a/meta-arm/conf/layer.conf
+++ b/meta-arm/conf/layer.conf
@@ -2,8 +2,8 @@
 BBPATH .= ":${LAYERDIR}"
 
 # We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \
-            ${LAYERDIR}/common/recipes-*/*/*.bbappend"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "arm"
 BBFILE_PATTERN_arm = "^${LAYERDIR}/"
diff --git a/meta-arm/common/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb b/meta-arm/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb
similarity index 100%
rename from meta-arm/common/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb
rename to meta-arm/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb