diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf
index a9d03fa..3f2cf39 100644
--- a/meta-phosphor/conf/layer.conf
+++ b/meta-phosphor/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 += "phosphor-layer"
 BBFILE_PATTERN_phosphor-layer = "^${LAYERDIR}/"
diff --git a/meta-phosphor/common/recipes-connectivity/net-snmp/net-snmp_%.bbappend b/meta-phosphor/recipes-connectivity/net-snmp/net-snmp_%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-connectivity/net-snmp/net-snmp_%.bbappend
rename to meta-phosphor/recipes-connectivity/net-snmp/net-snmp_%.bbappend
diff --git a/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend b/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend
rename to meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend
diff --git a/meta-phosphor/common/recipes-core/base-files/base-files/fstab b/meta-phosphor/recipes-core/base-files/base-files/fstab
similarity index 100%
rename from meta-phosphor/common/recipes-core/base-files/base-files/fstab
rename to meta-phosphor/recipes-core/base-files/base-files/fstab
diff --git a/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend b/meta-phosphor/recipes-core/base-files/base-files_%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend
rename to meta-phosphor/recipes-core/base-files/base-files_%.bbappend
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/0001-Stop-watchdog-first-on-startup.patch b/meta-phosphor/recipes-core/busybox/busybox/0001-Stop-watchdog-first-on-startup.patch
similarity index 100%
rename from meta-phosphor/common/recipes-core/busybox/busybox/0001-Stop-watchdog-first-on-startup.patch
rename to meta-phosphor/recipes-core/busybox/busybox/0001-Stop-watchdog-first-on-startup.patch
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/busybox.cfg b/meta-phosphor/recipes-core/busybox/busybox/busybox.cfg
similarity index 100%
rename from meta-phosphor/common/recipes-core/busybox/busybox/busybox.cfg
rename to meta-phosphor/recipes-core/busybox/busybox/busybox.cfg
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/flash.cfg b/meta-phosphor/recipes-core/busybox/busybox/flash.cfg
similarity index 100%
rename from meta-phosphor/common/recipes-core/busybox/busybox/flash.cfg
rename to meta-phosphor/recipes-core/busybox/busybox/flash.cfg
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/mountpoint.cfg b/meta-phosphor/recipes-core/busybox/busybox/mountpoint.cfg
similarity index 100%
rename from meta-phosphor/common/recipes-core/busybox/busybox/mountpoint.cfg
rename to meta-phosphor/recipes-core/busybox/busybox/mountpoint.cfg
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox_%.bbappend b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-core/busybox/busybox_%.bbappend
rename to meta-phosphor/recipes-core/busybox/busybox_%.bbappend
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch b/meta-phosphor/recipes-core/dropbear/dropbear/0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch
similarity index 100%
rename from meta-phosphor/common/recipes-core/dropbear/dropbear/0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch
rename to meta-phosphor/recipes-core/dropbear/dropbear/0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch b/meta-phosphor/recipes-core/dropbear/dropbear/0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch
similarity index 100%
rename from meta-phosphor/common/recipes-core/dropbear/dropbear/0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch
rename to meta-phosphor/recipes-core/dropbear/dropbear/0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-phosphor/recipes-core/dropbear/dropbear/dropbearkey.service
similarity index 100%
rename from meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service
rename to meta-phosphor/recipes-core/dropbear/dropbear/dropbearkey.service
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend b/meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend
rename to meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend
diff --git a/meta-phosphor/common/recipes-core/glib-2.0/glib-2.0%.bbappend b/meta-phosphor/recipes-core/glib-2.0/glib-2.0%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-core/glib-2.0/glib-2.0%.bbappend
rename to meta-phosphor/recipes-core/glib-2.0/glib-2.0%.bbappend
diff --git a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-core/os-release/os-release.bbappend
rename to meta-phosphor/recipes-core/os-release/os-release.bbappend
diff --git a/meta-phosphor/common/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
rename to meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
diff --git a/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/meta-phosphor/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
rename to meta-phosphor/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
diff --git a/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/meta-phosphor/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
rename to meta-phosphor/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/recipes-core/systemd/obmc-targets.bb
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
rename to meta-phosphor/recipes-core/systemd/obmc-targets.bb
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fans-ready.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-crash@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-mapper.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-mapper.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-standby.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-standby.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-standby.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-standby.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target
rename to meta-phosphor/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch b/meta-phosphor/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch
rename to meta-phosphor/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0003-basic-Factor-out-string-checking-from-name_to_prefix.patch b/meta-phosphor/recipes-core/systemd/systemd/0003-basic-Factor-out-string-checking-from-name_to_prefix.patch
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/systemd/0003-basic-Factor-out-string-checking-from-name_to_prefix.patch
rename to meta-phosphor/recipes-core/systemd/systemd/0003-basic-Factor-out-string-checking-from-name_to_prefix.patch
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0004-basic-Use-path-escaping-when-mangling-path-instances.patch b/meta-phosphor/recipes-core/systemd/systemd/0004-basic-Use-path-escaping-when-mangling-path-instances.patch
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/systemd/0004-basic-Use-path-escaping-when-mangling-path-instances.patch
rename to meta-phosphor/recipes-core/systemd/systemd/0004-basic-Use-path-escaping-when-mangling-path-instances.patch
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0005-dont-return-error-if-unable-to-create-network-namespace.patch b/meta-phosphor/recipes-core/systemd/systemd/0005-dont-return-error-if-unable-to-create-network-namespace.patch
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/systemd/0005-dont-return-error-if-unable-to-create-network-namespace.patch
rename to meta-phosphor/recipes-core/systemd/systemd/0005-dont-return-error-if-unable-to-create-network-namespace.patch
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/default.network b/meta-phosphor/recipes-core/systemd/systemd/default.network
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/systemd/default.network
rename to meta-phosphor/recipes-core/systemd/systemd/default.network
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
rename to meta-phosphor/recipes-core/systemd/systemd_%.bbappend
diff --git a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-4-byte-read-support-466.patch b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools/0001-4-byte-read-support-466.patch
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-4-byte-read-support-466.patch
rename to meta-phosphor/recipes-devtools/i2c-tools/i2c-tools/0001-4-byte-read-support-466.patch
diff --git a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-i2cget-Add-support-for-i2c-block-data.patch b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools/0001-i2cget-Add-support-for-i2c-block-data.patch
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-i2cget-Add-support-for-i2c-block-data.patch
rename to meta-phosphor/recipes-devtools/i2c-tools/i2c-tools/0001-i2cget-Add-support-for-i2c-block-data.patch
diff --git a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools_%.bbappend b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools_%.bbappend
rename to meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend
diff --git a/meta-phosphor/common/recipes-devtools/iotools/iotools/iotools-setup.service b/meta-phosphor/recipes-devtools/iotools/iotools/iotools-setup.service
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/iotools/iotools/iotools-setup.service
rename to meta-phosphor/recipes-devtools/iotools/iotools/iotools-setup.service
diff --git a/meta-phosphor/common/recipes-devtools/iotools/iotools_1.6.bb b/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/iotools/iotools_1.6.bb
rename to meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb
diff --git a/meta-phosphor/common/recipes-devtools/perl/yaml-tiny_1.73.bb b/meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/perl/yaml-tiny_1.73.bb
rename to meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/pyphosphor.bb b/meta-phosphor/recipes-devtools/python/pyphosphor.bb
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/pyphosphor.bb
rename to meta-phosphor/recipes-devtools/python/pyphosphor.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle.inc b/meta-phosphor/recipes-devtools/python/python-bottle.inc
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python-bottle.inc
rename to meta-phosphor/recipes-devtools/python/python-bottle.inc
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE b/meta-phosphor/recipes-devtools/python/python-bottle/LICENSE
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE
rename to meta-phosphor/recipes-devtools/python/python-bottle/LICENSE
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch b/meta-phosphor/recipes-devtools/python/python-bottle/json-format.patch
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch
rename to meta-phosphor/recipes-devtools/python/python-bottle/json-format.patch
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.13.bb b/meta-phosphor/recipes-devtools/python/python-bottle_0.12.13.bb
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.13.bb
rename to meta-phosphor/recipes-devtools/python/python-bottle_0.12.13.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-gevent-websocket_0.10.1.bb b/meta-phosphor/recipes-devtools/python/python-gevent-websocket_0.10.1.bb
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python-gevent-websocket_0.10.1.bb
rename to meta-phosphor/recipes-devtools/python/python-gevent-websocket_0.10.1.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-inflection.inc b/meta-phosphor/recipes-devtools/python/python-inflection.inc
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python-inflection.inc
rename to meta-phosphor/recipes-devtools/python/python-inflection.inc
diff --git a/meta-phosphor/common/recipes-devtools/python/python-inflection_0.3.1.bb b/meta-phosphor/recipes-devtools/python/python-inflection_0.3.1.bb
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python-inflection_0.3.1.bb
rename to meta-phosphor/recipes-devtools/python/python-inflection_0.3.1.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-mako_1.0.7.bb b/meta-phosphor/recipes-devtools/python/python-mako_1.0.7.bb
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python-mako_1.0.7.bb
rename to meta-phosphor/recipes-devtools/python/python-mako_1.0.7.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch b/meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
rename to meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
diff --git a/meta-phosphor/common/recipes-devtools/python/python-pygobject_2.28.7.bb b/meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python-pygobject_2.28.7.bb
rename to meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-pyyaml_%.bbappend b/meta-phosphor/recipes-devtools/python/python-pyyaml_%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python-pyyaml_%.bbappend
rename to meta-phosphor/recipes-devtools/python/python-pyyaml_%.bbappend
diff --git a/meta-phosphor/common/recipes-devtools/python/python/0001-json-Use-int-long.__str__-to-convert-subclasses.patch b/meta-phosphor/recipes-devtools/python/python/0001-json-Use-int-long.__str__-to-convert-subclasses.patch
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python/0001-json-Use-int-long.__str__-to-convert-subclasses.patch
rename to meta-phosphor/recipes-devtools/python/python/0001-json-Use-int-long.__str__-to-convert-subclasses.patch
diff --git a/meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend b/meta-phosphor/recipes-devtools/python/python_2.%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend
rename to meta-phosphor/recipes-devtools/python/python_2.%.bbappend
diff --git a/meta-phosphor/common/recipes-devtools/python/wsgiref-2.7-manifest.inc b/meta-phosphor/recipes-devtools/python/wsgiref-2.7-manifest.inc
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/wsgiref-2.7-manifest.inc
rename to meta-phosphor/recipes-devtools/python/wsgiref-2.7-manifest.inc
diff --git a/meta-phosphor/common/recipes-devtools/rsync/rsync_%.bbappend b/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/rsync/rsync_%.bbappend
rename to meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend
diff --git a/meta-phosphor/common/recipes-extended/gpioplus/gpioplus_git.bb b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb
similarity index 100%
rename from meta-phosphor/common/recipes-extended/gpioplus/gpioplus_git.bb
rename to meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb
diff --git a/meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus.bb
similarity index 100%
rename from meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb
rename to meta-phosphor/recipes-extended/sdbusplus/sdbusplus.bb
diff --git a/meta-phosphor/common/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb
similarity index 100%
rename from meta-phosphor/common/recipes-extended/sdeventplus/sdeventplus_git.bb
rename to meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py b/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py
rename to meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service b/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
rename to meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-button-power.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power.bb
rename to meta-phosphor/recipes-phosphor/chassis/obmc-button-power.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset.bb
rename to meta-phosphor/recipes-phosphor/chassis/obmc-button-reset.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis.bb
rename to meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots.bb
rename to meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb
rename to meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb
rename to meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
rename to meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-powered-off@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-powered-off@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-powered-off@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-powered-off@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-running@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-running@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-running@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-running@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-pcie-detect.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb
rename to meta-phosphor/recipes-phosphor/chassis/obmc-pcie-detect.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
rename to meta-phosphor/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
rename to meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once.bb b/meta-phosphor/recipes-phosphor/clear-once/clear-once.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/clear-once/clear-once.bb
rename to meta-phosphor/recipes-phosphor/clear-once/clear-once.bb
diff --git a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once/clear-once.service b/meta-phosphor/recipes-phosphor/clear-once/clear-once/clear-once.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/clear-once/clear-once/clear-once.service
rename to meta-phosphor/recipes-phosphor/clear-once/clear-once/clear-once.service
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
rename to meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
rename to meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.conf
rename to meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service
rename to meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console@.service
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/console/obmc-console_git.bb
rename to meta-phosphor/recipes-phosphor/console/obmc-console_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service
rename to meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service
diff --git a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager_git.bb
rename to meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms.bb b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/dbus-perms.bb
rename to meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms/org.openbmc.conf b/meta-phosphor/recipes-phosphor/dbus/dbus-perms/org.openbmc.conf
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/dbus-perms/org.openbmc.conf
rename to meta-phosphor/recipes-phosphor/dbus/dbus-perms/org.openbmc.conf
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-mapper.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
rename to meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
diff --git a/meta-phosphor/common/recipes-phosphor/devtools/obmc-pydevtools.bb b/meta-phosphor/recipes-phosphor/devtools/obmc-pydevtools.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/devtools/obmc-pydevtools.bb
rename to meta-phosphor/recipes-phosphor/devtools/obmc-pydevtools.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb
rename to meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.inc
rename to meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
rename to meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
rename to meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/files/Makefile b/meta-phosphor/recipes-phosphor/fans/files/Makefile
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/files/Makefile
rename to meta-phosphor/recipes-phosphor/fans/files/Makefile
diff --git a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.c b/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.c
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.c
rename to meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.c
diff --git a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service b/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
rename to meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb
rename to meta-phosphor/recipes-phosphor/fans/obmc-control-fan.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
rename to meta-phosphor/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
rename to meta-phosphor/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb b/meta-phosphor/recipes-phosphor/fans/obmc-phosphor-fand.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb
rename to meta-phosphor/recipes-phosphor/fans/obmc-phosphor-fand.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
rename to meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-pid-control.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/fans/phosphor-pid-control.bb
rename to meta-phosphor/recipes-phosphor/fans/phosphor-pid-control.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/files/OpenBMC.priv b/meta-phosphor/recipes-phosphor/flash/files/OpenBMC.priv
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/files/OpenBMC.priv
rename to meta-phosphor/recipes-phosphor/flash/files/OpenBMC.priv
diff --git a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.py b/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.py
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.py
rename to meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.py
diff --git a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service b/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
rename to meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb
rename to meta-phosphor/recipes-phosphor/flash/obmc-flash-bios.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
rename to meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
rename to meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc.bb
rename to meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
rename to meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download.bb b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download.bb
rename to meta-phosphor/recipes-phosphor/flash/obmc-mgr-download.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
rename to meta-phosphor/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb b/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb
rename to meta-phosphor/recipes-phosphor/flash/obmc-op-flasher.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb b/meta-phosphor/recipes-phosphor/flash/obmc-phosphor-flashd.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb
rename to meta-phosphor/recipes-phosphor/flash/obmc-phosphor-flashd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-image-signing.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-image-signing.bb
rename to meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb
rename to meta-phosphor/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend b/meta-phosphor/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend
rename to meta-phosphor/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager-error-native.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager-error-native.bb
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.inc
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/software.conf b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/software.conf
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/software.conf
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/software.conf
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/synclist b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/synclist
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/synclist
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/synclist
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
rename to meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
rename to meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service
rename to meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service
diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
rename to meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb
rename to meta-phosphor/recipes-phosphor/host/obmc-op-control-host.bb
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
rename to meta-phosphor/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
rename to meta-phosphor/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
diff --git a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.bb
rename to meta-phosphor/recipes-phosphor/host/phosphor-host-postd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.inc b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd.inc
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.inc
rename to meta-phosphor/recipes-phosphor/host/phosphor-host-postd.inc
diff --git a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd/lpcsnoop.service b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd/lpcsnoop.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd/lpcsnoop.service
rename to meta-phosphor/recipes-phosphor/host/phosphor-host-postd/lpcsnoop.service
diff --git a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-debug-tarball.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-debug-tarball.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-debug-tarball.bb
rename to meta-phosphor/recipes-phosphor/images/obmc-phosphor-debug-tarball.bb
diff --git a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image.bb
rename to meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
diff --git a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-initramfs.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-initramfs.bb
rename to meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb
diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-init.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-init.sh
rename to meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh
diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh
rename to meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh
diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-update.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-update.sh
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-update.sh
rename to meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-update.sh
diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/whitelist b/meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/initrdscripts/files/whitelist
rename to meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist
diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb b/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb
rename to meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/bmcweb.bb
rename to meta-phosphor/recipes-phosphor/interfaces/bmcweb.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.service b/meta-phosphor/recipes-phosphor/interfaces/bmcweb/bmcweb.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.service
rename to meta-phosphor/recipes-phosphor/interfaces/bmcweb/bmcweb.service
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.socket b/meta-phosphor/recipes-phosphor/interfaces/bmcweb/bmcweb.socket
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.socket
rename to meta-phosphor/recipes-phosphor/interfaces/bmcweb/bmcweb.socket
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent.bb b/meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent.bb
rename to meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service b/meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service
rename to meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket b/meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket
rename to meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb
rename to meta-phosphor/recipes-phosphor/interfaces/phosphor-rest.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.inc b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest.inc
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.inc
rename to meta-phosphor/recipes-phosphor/interfaces/phosphor-rest.inc
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app
rename to meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf
rename to meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/url_config.json b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/url_config.json
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/url_config.json
rename to meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/url_config.json
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus.bb b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus.bb
rename to meta-phosphor/recipes-phosphor/interfaces/rest-dbus.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service
rename to meta-phosphor/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.socket b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus/rest-dbus.socket
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.socket
rename to meta-phosphor/recipes-phosphor/interfaces/rest-dbus/rest-dbus.socket
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite.bb b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite.bb
rename to meta-phosphor/recipes-phosphor/interfaces/slpd-lite.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
rename to meta-phosphor/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/obmc-inventory.bb b/meta-phosphor/recipes-phosphor/inventory/obmc-inventory.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/inventory/obmc-inventory.bb
rename to meta-phosphor/recipes-phosphor/inventory/obmc-inventory.bb
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag-native.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag-native.bb
rename to meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag/assettag.yaml b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag/assettag.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag/assettag.yaml
rename to meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag/assettag.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb
rename to meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb
rename to meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.inc
rename to meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
rename to meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_cap.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_cap.json
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_cap.json
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_cap.json
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw/config.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw/config.yaml
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist/phosphor-ipmi-fru-whitelist-native.conf b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist/phosphor-ipmi-fru-whitelist-native.conf
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist/phosphor-ipmi-fru-whitelist-native.conf
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist/phosphor-ipmi-fru-whitelist-native.conf
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw/config.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw/config.yaml
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel/config.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel/config.yaml
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.socket b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.socket
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.socket
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.socket
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw/merge_sensor_config.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw/merge_sensor_config.py
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw/merge_sensor_config.py
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw/merge_sensor_config.py
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb
rename to meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-error-native.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-error-native.bb
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.inc
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs.bb
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/70-leds.rules b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs/70-leds.rules
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/70-leds.rules
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs/70-leds.rules
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service
rename to meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend b/meta-phosphor/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend
rename to meta-phosphor/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend
diff --git a/meta-phosphor/common/recipes-phosphor/logging/ffdc.bb b/meta-phosphor/recipes-phosphor/logging/ffdc.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/logging/ffdc.bb
rename to meta-phosphor/recipes-phosphor/logging/ffdc.bb
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb
rename to meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example/callouts.yaml b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example/callouts.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example/callouts.yaml
rename to meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example/callouts.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb
rename to meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb
rename to meta-phosphor/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb
rename to meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service b/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
rename to meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-lpc-ctrl.rules b/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-lpc-ctrl.rules
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-lpc-ctrl.rules
rename to meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-lpc-ctrl.rules
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules b/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules
rename to meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch b/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch
rename to meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb
rename to meta-phosphor/recipes-phosphor/mboxd/mboxd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
rename to meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service
rename to meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service
diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb
rename to meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/mrw/mrw-native.bb
rename to meta-phosphor/recipes-phosphor/mrw/mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb
rename to meta-phosphor/recipes-phosphor/mrw/mrw-patch-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-perl-tools-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/mrw/mrw-perl-tools-native.bb
rename to meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/network/inarp.bb b/meta-phosphor/recipes-phosphor/network/inarp.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/network/inarp.bb
rename to meta-phosphor/recipes-phosphor/network/inarp.bb
diff --git a/meta-phosphor/common/recipes-phosphor/network/inarp/inarp.service b/meta-phosphor/recipes-phosphor/network/inarp/inarp.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/network/inarp/inarp.service
rename to meta-phosphor/recipes-phosphor/network/inarp/inarp.service
diff --git a/meta-phosphor/common/recipes-phosphor/network/network.bb b/meta-phosphor/recipes-phosphor/network/network.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/network/network.bb
rename to meta-phosphor/recipes-phosphor/network/network.bb
diff --git a/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service b/meta-phosphor/recipes-phosphor/network/network/xyz.openbmc_project.Network.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service
rename to meta-phosphor/recipes-phosphor/network/network/xyz.openbmc_project.Network.service
diff --git a/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service b/meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service
rename to meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service
diff --git a/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/network/phosphor-snmp_git.bb
rename to meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
rename to meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb
rename to meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb
rename to meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb
diff --git a/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts.bb b/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts.bb
rename to meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb
diff --git a/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts/init b/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts/init
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts/init
rename to meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts/init
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor.bb b/meta-phosphor/recipes-phosphor/sensors/obmc-mgr-sensor.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor.bb
rename to meta-phosphor/recipes-phosphor/sensors/obmc-mgr-sensor.bb
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service b/meta-phosphor/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
rename to meta-phosphor/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb
rename to meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb
rename to meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon.bb
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
rename to meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
rename to meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service
rename to meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh
rename to meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
rename to meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults-native.bb
rename to meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
rename to meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.bb
rename to meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc
rename to meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
rename to meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
rename to meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb
rename to meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw/mrw-override-settings.yaml b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw/mrw-override-settings.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw/mrw-override-settings.yaml
rename to meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw/mrw-override-settings.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/merge_settings.py b/meta-phosphor/recipes-phosphor/settings/phosphor-settings/merge_settings.py
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/merge_settings.py
rename to meta-phosphor/recipes-phosphor/settings/phosphor-settings/merge_settings.py
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf.bb b/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf.bb
rename to meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf.bb
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
rename to meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf b/meta-phosphor/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf
rename to meta-phosphor/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-discover-system-state@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
rename to meta-phosphor/recipes-phosphor/state/files/phosphor-discover-system-state@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reboot-host@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reboot-host@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/state/files/phosphor-reboot-host@.service
rename to meta-phosphor/recipes-phosphor/state/files/phosphor-reboot-host@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-check@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
rename to meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-check@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service
rename to meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-running@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-running@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-running@.service
rename to meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-running@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service
rename to meta-phosphor/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
rename to meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
rename to meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
rename to meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
rename to meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.py b/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.py
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.py
rename to meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.py
diff --git a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service b/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service
rename to meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.service
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc.bb b/meta-phosphor/recipes-phosphor/system/obmc-control-bmc.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc.bb
rename to meta-phosphor/recipes-phosphor/system/obmc-control-bmc.bb
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service b/meta-phosphor/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
rename to meta-phosphor/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb b/meta-phosphor/recipes-phosphor/system/obmc-mgr-system.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb
rename to meta-phosphor/recipes-phosphor/system/obmc-mgr-system.bb
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service b/meta-phosphor/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
rename to meta-phosphor/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb
rename to meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb
rename to meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb
diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf
rename to meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf
diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf
rename to meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf
diff --git a/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager.bb
rename to meta-phosphor/recipes-phosphor/users/phosphor-user-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service
rename to meta-phosphor/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service
diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm/fb.modes b/meta-phosphor/recipes-phosphor/video/fbterm/fb.modes
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/video/fbterm/fb.modes
rename to meta-phosphor/recipes-phosphor/video/fbterm/fb.modes
diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm b/meta-phosphor/recipes-phosphor/video/fbterm/fbterm
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm
rename to meta-phosphor/recipes-phosphor/video/fbterm/fbterm
diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm.service b/meta-phosphor/recipes-phosphor/video/fbterm/fbterm.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm.service
rename to meta-phosphor/recipes-phosphor/video/fbterm/fbterm.service
diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm_git.bb b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/video/fbterm_git.bb
rename to meta-phosphor/recipes-phosphor/video/fbterm_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/video/liberation-fonts_2.00.1.bbappend b/meta-phosphor/recipes-phosphor/video/liberation-fonts_2.00.1.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/video/liberation-fonts_2.00.1.bbappend
rename to meta-phosphor/recipes-phosphor/video/liberation-fonts_2.00.1.bbappend
diff --git a/meta-phosphor/common/recipes-phosphor/video/uart-render-controller/uart-render-controller.service b/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
rename to meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
diff --git a/meta-phosphor/common/recipes-phosphor/video/uart-render-controller_git.bb b/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/video/uart-render-controller_git.bb
rename to meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog.bb
rename to meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog.bb
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
rename to meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
rename to meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
rename to meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf
rename to meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf
diff --git a/meta-phosphor/common/recipes-phosphor/webui/phosphor-webui.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/webui/phosphor-webui.bb
rename to meta-phosphor/recipes-phosphor/webui/phosphor-webui.bb
diff --git a/meta-phosphor/common/recipes-support/cjson/cjson_git.bb b/meta-phosphor/recipes-support/cjson/cjson_git.bb
similarity index 100%
rename from meta-phosphor/common/recipes-support/cjson/cjson_git.bb
rename to meta-phosphor/recipes-support/cjson/cjson_git.bb
diff --git a/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Add-ppc64le-cross-build-support.patch b/meta-phosphor/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Add-ppc64le-cross-build-support.patch
similarity index 100%
rename from meta-phosphor/common/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Add-ppc64le-cross-build-support.patch
rename to meta-phosphor/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Add-ppc64le-cross-build-support.patch
diff --git a/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error_%.bbappend b/meta-phosphor/recipes-support/libgpg-error/libgpg-error_%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-support/libgpg-error/libgpg-error_%.bbappend
rename to meta-phosphor/recipes-support/libgpg-error/libgpg-error_%.bbappend
diff --git a/meta-phosphor/common/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend b/meta-phosphor/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend
rename to meta-phosphor/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend
diff --git a/meta-phosphor/common/recipes-support/nlohmann-json/nlohmann-json_git.bb b/meta-phosphor/recipes-support/nlohmann-json/nlohmann-json_git.bb
similarity index 100%
rename from meta-phosphor/common/recipes-support/nlohmann-json/nlohmann-json_git.bb
rename to meta-phosphor/recipes-support/nlohmann-json/nlohmann-json_git.bb
diff --git a/meta-phosphor/common/recipes-support/rng-tools/rng-tools/rngd.service b/meta-phosphor/recipes-support/rng-tools/rng-tools/rngd.service
similarity index 100%
rename from meta-phosphor/common/recipes-support/rng-tools/rng-tools/rngd.service
rename to meta-phosphor/recipes-support/rng-tools/rng-tools/rngd.service
diff --git a/meta-phosphor/common/recipes-support/rng-tools/rng-tools_%.bbappend b/meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend
similarity index 100%
rename from meta-phosphor/common/recipes-support/rng-tools/rng-tools_%.bbappend
rename to meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend
diff --git a/meta-phosphor/common/recipes-support/serialization/cereal_1.2.2.bb b/meta-phosphor/recipes-support/serialization/cereal_1.2.2.bb
similarity index 100%
rename from meta-phosphor/common/recipes-support/serialization/cereal_1.2.2.bb
rename to meta-phosphor/recipes-support/serialization/cereal_1.2.2.bb
diff --git a/meta-phosphor/common/recipes-textproc/json-perl/json-perl_2.97001.bb b/meta-phosphor/recipes-textproc/json-perl/json-perl_2.97001.bb
similarity index 100%
rename from meta-phosphor/common/recipes-textproc/json-perl/json-perl_2.97001.bb
rename to meta-phosphor/recipes-textproc/json-perl/json-perl_2.97001.bb
diff --git a/meta-phosphor/common/recipes.txt b/meta-phosphor/recipes.txt
similarity index 100%
rename from meta-phosphor/common/recipes.txt
rename to meta-phosphor/recipes.txt