diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf
index 7b01b6c..50d750d 100644
--- a/meta-openpower/conf/layer.conf
+++ b/meta-openpower/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 += "openpower"
 BBFILE_PATTERN_openpower = "^${LAYERDIR}/"
diff --git a/meta-openpower/common/recipes-bsp/ffs/ffs.inc b/meta-openpower/recipes-bsp/ffs/ffs.inc
similarity index 100%
rename from meta-openpower/common/recipes-bsp/ffs/ffs.inc
rename to meta-openpower/recipes-bsp/ffs/ffs.inc
diff --git a/meta-openpower/common/recipes-bsp/ffs/ffs_git.bb b/meta-openpower/recipes-bsp/ffs/ffs_git.bb
similarity index 100%
rename from meta-openpower/common/recipes-bsp/ffs/ffs_git.bb
rename to meta-openpower/recipes-bsp/ffs/ffs_git.bb
diff --git a/meta-openpower/common/recipes-bsp/fsidbg/fsidbg.bb b/meta-openpower/recipes-bsp/fsidbg/fsidbg.bb
similarity index 100%
rename from meta-openpower/common/recipes-bsp/fsidbg/fsidbg.bb
rename to meta-openpower/recipes-bsp/fsidbg/fsidbg.bb
diff --git a/meta-openpower/common/recipes-bsp/pdbg/pdbg/0001-CFAM-reg-0x2918-access-hack.patch b/meta-openpower/recipes-bsp/pdbg/pdbg/0001-CFAM-reg-0x2918-access-hack.patch
similarity index 100%
rename from meta-openpower/common/recipes-bsp/pdbg/pdbg/0001-CFAM-reg-0x2918-access-hack.patch
rename to meta-openpower/recipes-bsp/pdbg/pdbg/0001-CFAM-reg-0x2918-access-hack.patch
diff --git a/meta-openpower/common/recipes-bsp/pdbg/pdbg_1.0.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_1.0.bb
similarity index 100%
rename from meta-openpower/common/recipes-bsp/pdbg/pdbg_1.0.bb
rename to meta-openpower/recipes-bsp/pdbg/pdbg_1.0.bb
diff --git a/meta-openpower/common/recipes-bsp/skiboot/gard.bb b/meta-openpower/recipes-bsp/skiboot/gard.bb
similarity index 100%
rename from meta-openpower/common/recipes-bsp/skiboot/gard.bb
rename to meta-openpower/recipes-bsp/skiboot/gard.bb
diff --git a/meta-openpower/common/recipes-bsp/skiboot/pflash.bb b/meta-openpower/recipes-bsp/skiboot/pflash.bb
similarity index 100%
rename from meta-openpower/common/recipes-bsp/skiboot/pflash.bb
rename to meta-openpower/recipes-bsp/skiboot/pflash.bb
diff --git a/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc b/meta-openpower/recipes-bsp/skiboot/skiboot.inc
similarity index 100%
rename from meta-openpower/common/recipes-bsp/skiboot/skiboot.inc
rename to meta-openpower/recipes-bsp/skiboot/skiboot.inc
diff --git a/meta-openpower/common/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb
rename to meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/dbus/openpower-dbus-interfaces.bb b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/dbus/openpower-dbus-interfaces.bb
rename to meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces.bb
diff --git a/meta-openpower/common/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend b/meta-openpower/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend
rename to meta-openpower/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend
diff --git a/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb
rename to meta-openpower/recipes-phosphor/debug/openpower-debug-collector.bb
diff --git a/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.inc
rename to meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc
diff --git a/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service
rename to meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service
diff --git a/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog-timeout@.service b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog-timeout@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog-timeout@.service
rename to meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog-timeout@.service
diff --git a/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service
rename to meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager.bb
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-check-clearvolatile@.service b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-check-clearvolatile@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-check-clearvolatile@.service
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-check-clearvolatile@.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-cleanup.service b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-cleanup.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-cleanup.service
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-cleanup.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-enable-clearvolatile@.service b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-enable-clearvolatile@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-enable-clearvolatile@.service
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-enable-clearvolatile@.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiattach.service b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiattach.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiattach.service
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiattach.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubipatch.service b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubipatch.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubipatch.service
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubipatch.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-ro@.service b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-ro@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-ro@.service
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-ro@.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-rw@.service b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-rw@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-rw@.service
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-rw@.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-updatesymlinks.service b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-updatesymlinks.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-updatesymlinks.service
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-updatesymlinks.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/org.open_power.Software.Host.Updater.service b/meta-openpower/recipes-phosphor/flash/openpower-software-manager/org.open_power.Software.Host.Updater.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/org.open_power.Software.Host.Updater.service
rename to meta-openpower/recipes-phosphor/flash/openpower-software-manager/org.open_power.Software.Host.Updater.service
diff --git a/meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager.bbappend b/meta-openpower/recipes-phosphor/flash/phosphor-software-manager.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager.bbappend
rename to meta-openpower/recipes-phosphor/flash/phosphor-software-manager.bbappend
diff --git a/meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager/software-bmc-updater.conf b/meta-openpower/recipes-phosphor/flash/phosphor-software-manager/software-bmc-updater.conf
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager/software-bmc-updater.conf
rename to meta-openpower/recipes-phosphor/flash/phosphor-software-manager/software-bmc-updater.conf
diff --git a/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb
rename to meta-openpower/recipes-phosphor/fsi/op-fsi.bb
diff --git a/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-disable.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service
rename to meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-disable.service
diff --git a/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-enable.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
rename to meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-enable.service
diff --git a/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
rename to meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
diff --git a/meta-openpower/common/recipes-phosphor/host/aspeed-lpc-ctrl.bb b/meta-openpower/recipes-phosphor/host/aspeed-lpc-ctrl.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/aspeed-lpc-ctrl.bb
rename to meta-openpower/recipes-phosphor/host/aspeed-lpc-ctrl.bb
diff --git a/meta-openpower/common/recipes-phosphor/host/aspeed-lpc-ctrl/pnorboot.service b/meta-openpower/recipes-phosphor/host/aspeed-lpc-ctrl/pnorboot.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/aspeed-lpc-ctrl/pnorboot.service
rename to meta-openpower/recipes-phosphor/host/aspeed-lpc-ctrl/pnorboot.service
diff --git a/meta-openpower/common/recipes-phosphor/host/checkstop-monitor.bb b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/checkstop-monitor.bb
rename to meta-openpower/recipes-phosphor/host/checkstop-monitor.bb
diff --git a/meta-openpower/common/recipes-phosphor/host/checkstop-monitor/checkstop.conf b/meta-openpower/recipes-phosphor/host/checkstop-monitor/checkstop.conf
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/checkstop-monitor/checkstop.conf
rename to meta-openpower/recipes-phosphor/host/checkstop-monitor/checkstop.conf
diff --git a/meta-openpower/common/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop b/meta-openpower/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
rename to meta-openpower/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
diff --git a/meta-openpower/common/recipes-phosphor/host/hostboot-settings.bb b/meta-openpower/recipes-phosphor/host/hostboot-settings.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/hostboot-settings.bb
rename to meta-openpower/recipes-phosphor/host/hostboot-settings.bb
diff --git a/meta-openpower/common/recipes-phosphor/host/hostboot-settings/hb_settings b/meta-openpower/recipes-phosphor/host/hostboot-settings/hb_settings
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/hostboot-settings/hb_settings
rename to meta-openpower/recipes-phosphor/host/hostboot-settings/hb_settings
diff --git a/meta-openpower/common/recipes-phosphor/host/hostboot-settings/hostboot-settings.service b/meta-openpower/recipes-phosphor/host/hostboot-settings/hostboot-settings.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/hostboot-settings/hostboot-settings.service
rename to meta-openpower/recipes-phosphor/host/hostboot-settings/hostboot-settings.service
diff --git a/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service b/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service
rename to meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service
diff --git a/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service b/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service
rename to meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service
diff --git a/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service b/meta-openpower/recipes-phosphor/host/op-host-control/vcs_workaround@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service
rename to meta-openpower/recipes-phosphor/host/op-host-control/vcs_workaround@.service
diff --git a/meta-openpower/common/recipes-phosphor/host/op-proc-control.bb b/meta-openpower/recipes-phosphor/host/op-proc-control.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/op-proc-control.bb
rename to meta-openpower/recipes-phosphor/host/op-proc-control.bb
diff --git a/meta-openpower/common/recipes-phosphor/host/p9-cfam-override.bb b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/p9-cfam-override.bb
rename to meta-openpower/recipes-phosphor/host/p9-cfam-override.bb
diff --git a/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb b/meta-openpower/recipes-phosphor/host/p9-host-start.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/p9-host-start.bb
rename to meta-openpower/recipes-phosphor/host/p9-host-start.bb
diff --git a/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb b/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb
rename to meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb
diff --git a/meta-openpower/common/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend b/meta-openpower/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend
rename to meta-openpower/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend
diff --git a/meta-openpower/common/recipes-phosphor/interfaces/phosphor-rest.bbappend b/meta-openpower/recipes-phosphor/interfaces/phosphor-rest.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/interfaces/phosphor-rest.bbappend
rename to meta-openpower/recipes-phosphor/interfaces/phosphor-rest.bbappend
diff --git a/meta-openpower/common/recipes-phosphor/interfaces/phosphor-rest/url_config.json b/meta-openpower/recipes-phosphor/interfaces/phosphor-rest/url_config.json
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/interfaces/phosphor-rest/url_config.json
rename to meta-openpower/recipes-phosphor/interfaces/phosphor-rest/url_config.json
diff --git a/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb b/meta-openpower/recipes-phosphor/inventory-upload/inventory-upload.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb
rename to meta-openpower/recipes-phosphor/inventory-upload/inventory-upload.bb
diff --git a/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service b/meta-openpower/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service
rename to meta-openpower/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service
diff --git a/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb
rename to meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml
rename to meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml
diff --git a/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native.bb
rename to meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb
rename to meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw/openpower-config.yaml b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw/openpower-config.yaml
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw/openpower-config.yaml
rename to meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw/openpower-config.yaml
diff --git a/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb
rename to meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist/openpower-ipmi-oem-whitelist-native.conf b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist/openpower-ipmi-oem-whitelist-native.conf
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist/openpower-ipmi-oem-whitelist-native.conf
rename to meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist/openpower-ipmi-oem-whitelist-native.conf
diff --git a/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.bb
rename to meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.bb
diff --git a/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.inc b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.inc
rename to meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc
diff --git a/meta-openpower/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend b/meta-openpower/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend
rename to meta-openpower/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend
diff --git a/meta-openpower/common/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend b/meta-openpower/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend
rename to meta-openpower/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend
diff --git a/meta-openpower/common/recipes-phosphor/logging/phosphor-logging.bbappend b/meta-openpower/recipes-phosphor/logging/phosphor-logging.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/logging/phosphor-logging.bbappend
rename to meta-openpower/recipes-phosphor/logging/phosphor-logging.bbappend
diff --git a/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-example-native.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-example-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-example-native.bb
rename to meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-example-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb
rename to meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb
rename to meta-openpower/recipes-phosphor/occ/openpower-occ-control.bb
diff --git a/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.inc
rename to meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc
diff --git a/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/occ-active.sh b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/occ-active.sh
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/occ-active.sh
rename to meta-openpower/recipes-phosphor/occ/openpower-occ-control/occ-active.sh
diff --git a/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service
rename to meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service
diff --git a/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service
rename to meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service
diff --git a/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service
rename to meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service
diff --git a/meta-openpower/common/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/meta-openpower/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
rename to meta-openpower/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
diff --git a/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
rename to meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
diff --git a/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend
rename to meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend
diff --git a/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
rename to meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
diff --git a/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
rename to meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-inventory-example/inventory b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example/inventory
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-inventory-example/inventory
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example/inventory
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-example/example.yaml b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example/example.yaml
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-example/example.yaml
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example/example.yaml
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-mrw/config.yaml b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw/config.yaml
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-mrw/config.yaml
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw/config.yaml
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.bb
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd.bb
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.bb
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd.inc
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd/70-op-vpd.rules b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd/70-op-vpd.rules
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd/70-op-vpd.rules
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd/70-op-vpd.rules
diff --git a/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service
rename to meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service
diff --git a/meta-openpower/common/recipes-phosphor/webui/phosphor-webui.bbappend b/meta-openpower/recipes-phosphor/webui/phosphor-webui.bbappend
similarity index 100%
rename from meta-openpower/common/recipes-phosphor/webui/phosphor-webui.bbappend
rename to meta-openpower/recipes-phosphor/webui/phosphor-webui.bbappend